Offline Mode: Remove Deprecated Code – P13 (#23359)

Author: kean

WordPress/Classes/Services/Stories/StoryEditor.swift

@@ -211,10 +211,6 @@ class StoryEditor: CameraController {
 }
 
 extension StoryEditor: PublishingEditor {
-    var prepublishingSourceView: UIView? {
-        return nil
-    }
-
     var alertBarButtonItem: UIBarButtonItem? {
         return nil
     }

WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift

@@ -1228,15 +1228,6 @@ extension AztecPostViewController: PostEditorStateContextDelegate {
         }
 
         switch keyPath {
-        case BasePost.statusKeyPath:
-            if let status = post.status {
-                postEditorStateContext.updated(postStatus: status)
-                editorContentWasUpdated()
-            }
-        case #keyPath(AbstractPost.date_created_gmt):
-            let dateCreated = post.dateCreated ?? Date()
-            postEditorStateContext.updated(publishDate: dateCreated)
-            editorContentWasUpdated()
         case #keyPath(AbstractPost.content):
             editorContentWasUpdated()
         default:
@@ -1253,14 +1244,10 @@ extension AztecPostViewController: PostEditorStateContextDelegate {
     }
 
     internal func addObservers(toPost: AbstractPost) {
-        toPost.addObserver(self, forKeyPath: AbstractPost.statusKeyPath, options: [], context: nil)
-        toPost.addObserver(self, forKeyPath: #keyPath(AbstractPost.date_created_gmt), options: [], context: nil)
         toPost.addObserver(self, forKeyPath: #keyPath(AbstractPost.content), options: [], context: nil)
     }
 
     internal func removeObservers(fromPost: AbstractPost) {
-        fromPost.removeObserver(self, forKeyPath: AbstractPost.statusKeyPath)
-        fromPost.removeObserver(self, forKeyPath: #keyPath(AbstractPost.date_created_gmt))
         fromPost.removeObserver(self, forKeyPath: #keyPath(AbstractPost.content))
     }
 }
@@ -2506,21 +2493,6 @@ extension AztecPostViewController {
         return failedIDs
     }
 
-    var hasFailedMedia: Bool {
-        return !failedMediaIDs.isEmpty
-    }
-
-    func removeFailedMedia() {
-        for mediaID in failedMediaIDs {
-            if let attachment = self.findAttachment(withUploadID: mediaID) {
-                richTextView.remove(attachmentID: attachment.identifier)
-            }
-            if let media = mediaCoordinator.media(withObjectID: mediaID) {
-                mediaCoordinator.delete(media)
-            }
-        }
-    }
-
     fileprivate func retryAllFailedMediaUploads() {
         for mediaID in failedMediaIDs {
             guard let attachment = self.findAttachment(withUploadID: mediaID),

WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift

@@ -125,10 +125,6 @@ class GutenbergMediaInserterHelper: NSObject {
         _ = mediaCoordinator.uploadMedia(for: post, automatedRetry: automatedRetry)
     }
 
-    func hasFailedMedia() -> Bool {
-        return mediaCoordinator.hasFailedMedia(for: post)
-    }
-
     func insert(exportableAsset: ExportableAsset, source: MediaSource) -> Media? {
         let info = MediaAnalyticsInfo(origin: .editor(source), selectionMethod: mediaSelectionMethod)
         return mediaCoordinator.addMedia(from: exportableAsset, to: self.post, analyticsInfo: info)

WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift

@@ -100,10 +100,6 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega
         return mediaInserterHelper.isUploadingMedia()
     }
 
-    var hasFailedMedia: Bool {
-        return mediaInserterHelper.hasFailedMedia()
-    }
-
     func cancelUploadOfAllMedia(for post: AbstractPost) {
         return mediaInserterHelper.cancelUploadOfAllMedia()
     }
@@ -190,8 +186,6 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega
 
     var post: AbstractPost {
         didSet {
-            removeObservers(fromPost: oldValue)
-            addObservers(toPost: post)
             postEditorStateContext = PostEditorStateContext(post: post, delegate: self)
             attachmentDelegate = AztecAttachmentDelegate(post: post)
             mediaPickerHelper = GutenbergMediaPickerHelper(context: self, post: post)
@@ -311,8 +305,6 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega
 
         super.init(nibName: nil, bundle: nil)
 
-        addObservers(toPost: post)
-
         self.navigationBarManager.delegate = self
         disableSocialConnectionsIfNecessary()
     }
@@ -323,7 +315,6 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega
 
     deinit {
         tearDownKeyboardObservers()
-        removeObservers(fromPost: post)
         gutenberg.invalidate()
         attachmentDelegate.cancelAllPendingMediaRequests()
     }
@@ -1228,24 +1219,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
 // MARK: - PostEditorStateContextDelegate
 
 extension GutenbergViewController: PostEditorStateContextDelegate {
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
-        guard let keyPath = keyPath else {
-            return
-        }
-
-        switch keyPath {
-        case BasePost.statusKeyPath:
-            if let status = post.status {
-                postEditorStateContext.updated(postStatus: status)
-            }
-        case #keyPath(AbstractPost.date_created_gmt):
-            let dateCreated = post.dateCreated ?? Date()
-            postEditorStateContext.updated(publishDate: dateCreated)
-        default:
-            super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
-        }
-    }
-
     func context(_ context: PostEditorStateContext, didChangeAction: PostEditorAction) {
         reloadPublishButton()
     }
@@ -1257,16 +1230,6 @@ extension GutenbergViewController: PostEditorStateContextDelegate {
     func reloadPublishButton() {
         navigationBarManager.reloadPublishButton()
     }
-
-    internal func addObservers(toPost: AbstractPost) {
-        toPost.addObserver(self, forKeyPath: AbstractPost.statusKeyPath, options: [], context: nil)
-        toPost.addObserver(self, forKeyPath: #keyPath(AbstractPost.date_created_gmt), options: [], context: nil)
-    }
-
-    internal func removeObservers(fromPost: AbstractPost) {
-        fromPost.removeObserver(self, forKeyPath: AbstractPost.statusKeyPath)
-        fromPost.removeObserver(self, forKeyPath: #keyPath(AbstractPost.date_created_gmt))
-    }
 }
 
 // MARK: - PostEditorNavigationBarManagerDelegate

WordPress/Classes/ViewRelated/Post/PostCardStatusViewModel.swift

@@ -7,16 +7,13 @@ class PostCardStatusViewModel: NSObject, AbstractPostMenuViewModel {
 
     let post: Post
 
-    private let isInternetReachable: Bool
     private let isJetpackFeaturesEnabled: Bool
     private let isBlazeFlagEnabled: Bool
 
     init(post: Post,
-         isInternetReachable: Bool = ReachabilityUtils.isInternetReachable(),
          isJetpackFeaturesEnabled: Bool = JetpackFeaturesRemovalCoordinator.jetpackFeaturesEnabled(),
          isBlazeFlagEnabled: Bool = BlazeHelper.isBlazeFlagEnabled()) {
         self.post = post
-        self.isInternetReachable = isInternetReachable
         self.isJetpackFeaturesEnabled = isJetpackFeaturesEnabled
         self.isBlazeFlagEnabled = isBlazeFlagEnabled
         super.init()

WordPress/Classes/ViewRelated/Post/PostEditor+Publish.swift

@@ -22,8 +22,6 @@ protocol PublishingEditor where Self: UIViewController {
     /// Title of the post
     var postTitle: String { get set }
 
-    var prepublishingSourceView: UIView? { get }
-
     var alertBarButtonItem: UIBarButtonItem? { get }
 
     /// Closure to be executed when the editor gets closed.
@@ -38,8 +36,6 @@ protocol PublishingEditor where Self: UIViewController {
     /// When the Prepublishing sheet or Prepublishing alert is dismissed, this is called.
     func publishingDismissed()
 
-    func removeFailedMedia()
-
     /// Returns the word counts of the content in the editor.
     var wordCount: UInt { get }
 
@@ -59,10 +55,6 @@ extension PublishingEditor {
         // Default implementation is empty, can be optionally implemented by other classes.
     }
 
-    func removeFailedMedia() {
-        // TODO: we can only implement this when GB bridge allows removal of blocks
-    }
-
     // The debouncer will perform this callback every 500ms in order to save the post locally with a delay.
     var debouncerCallback: (() -> Void) {
         return { [weak self] in

WordPress/Classes/ViewRelated/Post/PostEditor.swift

@@ -49,10 +49,6 @@ protocol PostEditor: PublishingEditor, UIViewControllerTransitioningDelegate {
     ///
     func cancelUploadOfAllMedia(for post: AbstractPost)
 
-    /// Whether the editor has failed media or not
-    ///
-    var hasFailedMedia: Bool { get }
-
     var isUploadingMedia: Bool { get }
 
     /// Verification prompt helper
@@ -73,9 +69,6 @@ protocol PostEditor: PublishingEditor, UIViewControllerTransitioningDelegate {
     /// Describes the editor type to be used in analytics reporting
     var analyticsEditorSource: String { get }
 
-    /// Error domain used when reporting error to Crash Logger
-    var errorDomain: String { get }
-
     /// Navigation bar manager for this post editor
     var navigationBarManager: PostEditorNavigationBarManager { get }
 
@@ -110,21 +103,9 @@ extension PostEditor {
         postEditorStateContext.updated(hasChanges: editorHasChanges)
     }
 
-    var mainContext: NSManagedObjectContext {
-        return ContextManager.sharedInstance().mainContext
-    }
-
-    var currentBlogCount: Int {
-        return postIsReblogged ? BlogQuery().hostedByWPCom(true).count(in: mainContext) : Blog.count(in: mainContext)
-    }
-
     var alertBarButtonItem: UIBarButtonItem? {
         return navigationBarManager.closeBarButtonItem
     }
-
-    var prepublishingSourceView: UIView? {
-        return navigationBarManager.publishButton
-    }
 }
 
 extension PostEditor where Self: UIViewController {

WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift

@@ -60,19 +60,6 @@ struct PostEditorAnalyticsSession {
         WPAppAnalytics.track(.editorSessionSwitchEditor, withProperties: commonProperties)
     }
 
-    mutating func forceOutcome(_ newOutcome: Outcome) {
-        // We're allowing an outcome to be force in a few specific cases:
-        // - If a post was published, that should be the outcome no matter what happens later
-        // - If a post is saved, that should be the outcome unless it's published later
-        // - Otherwise, we'll use whatever outcome is set when the session ends
-        switch (outcome, newOutcome) {
-        case (_, .publish), (nil, .save):
-            self.outcome = newOutcome
-        default:
-            break
-        }
-    }
-
     func end(outcome endOutcome: Outcome) {
         let outcome = self.outcome ?? endOutcome
         let properties: [String: Any] = [

WordPress/Classes/ViewRelated/Post/PostEditorState.swift

@@ -68,10 +68,6 @@ public class PostEditorStateContext {
         }
     }
 
-    fileprivate var originalPostStatus: BasePost.Status?
-    fileprivate var currentPostStatus: BasePost.Status?
-    fileprivate var currentPublishDate: Date?
-    fileprivate var userCanPublish: Bool
     private weak var delegate: PostEditorStateContextDelegate?
 
     fileprivate var hasContent = false {
@@ -115,7 +111,6 @@ public class PostEditorStateContext {
 
         self.init(originalPostStatus: originalPostStatus,
                   userCanPublish: userCanPublish,
-                  publishDate: post.dateCreated,
                   delegate: delegate)
 
         if let action = action {
@@ -126,16 +121,9 @@ public class PostEditorStateContext {
     /// The default initializer
     ///
     /// - Parameters:
-    ///   - originalPostStatus: If the post was already published (saved to the server) what is the status
-    ///   - userCanPublish: Does the user have permission to publish posts or merely create drafts
-    ///   - publishDate: The post publish date
     ///   - delegate: Delegate for listening to change in state for the editor
     ///
-    required init(originalPostStatus: BasePost.Status? = nil, userCanPublish: Bool = true, publishDate: Date? = nil, delegate: PostEditorStateContextDelegate) {
-        self.originalPostStatus = originalPostStatus
-        self.currentPostStatus = originalPostStatus
-        self.userCanPublish = userCanPublish
-        self.currentPublishDate = publishDate
+    required init(originalPostStatus: BasePost.Status? = nil, userCanPublish: Bool = true, delegate: PostEditorStateContextDelegate) {
         self.delegate = delegate
         self.action = PostEditorStateContext.initialAction(for: originalPostStatus, userCanPublish: userCanPublish)
     }
@@ -157,18 +145,6 @@ public class PostEditorStateContext {
         }
     }
 
-    /// Call when the post status has changed due to a remote operation
-    ///
-    func updated(postStatus: BasePost.Status) {
-        currentPostStatus = postStatus
-    }
-
-    /// Call when the publish date has changed (picked a future date) or nil if publish immediately selected
-    ///
-    func updated(publishDate: Date?) {
-        currentPublishDate = publishDate
-    }
-
     /// Call whenever the post content is not empty - title or content body
     ///
     func updated(hasContent: Bool) {

WordPress/Classes/ViewRelated/Post/PostListCell.swift

@@ -7,8 +7,6 @@ protocol AbstractPostListCell {
 }
 
 final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResultCell, Reusable {
-    var isEnabled = true
-
     // MARK: - Views
 
     private lazy var mainStackView: UIStackView = {