Merge branch 'trunk' into tonyli-xcode-target-authenticator

Author: crazytonyli

Gemfile

@@ -6,9 +6,11 @@ gem 'cocoapods', '~> 1.14'
 gem 'commonmarker'
 gem 'danger-dangermattic', '~> 1.0'
 gem 'dotenv'
-# 2.219.0 includes a fix for a bug introduced in 2.218.0
-# See https://github.com/fastlane/fastlane/issues/21762#issuecomment-1875208663
-gem 'fastlane', '~> 2.219'
+# 2.221.0 includes a fix for an ASC-interfacing bug
+#
+# See https://github.com/wordpress-mobile/WordPress-iOS/pull/23118#issuecomment-2173254418
+# and https://github.com/fastlane/fastlane/pull/21995
+gem 'fastlane', '~> 2.221'
 gem 'fastlane-plugin-appcenter', '~> 2.1'
 gem 'fastlane-plugin-sentry'
 # This comment avoids typing to switch to a development version for testing.

Gemfile.lock

@@ -24,17 +24,17 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.926.0)
-    aws-sdk-core (3.194.2)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.85.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.1)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -163,7 +163,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -268,22 +268,22 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.22.3)
@@ -329,7 +329,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.1)
@@ -363,6 +364,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -398,7 +400,7 @@ DEPENDENCIES
   commonmarker
   danger-dangermattic (~> 1.0)
   dotenv
-  fastlane (~> 2.219)
+  fastlane (~> 2.221)
   fastlane-plugin-appcenter (~> 2.1)
   fastlane-plugin-sentry
   fastlane-plugin-wpmreleasetoolkit (~> 11.0)

Gutenberg/config.yml

@@ -9,6 +9,6 @@
  #
  #   LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install
 ref:
-  tag: v1.120.0
+  tag: v1.120.1
 github_org: wordpress-mobile
 repo_name: gutenberg-mobile

Podfile.lock

@@ -15,7 +15,7 @@ PODS:
   - Gravatar (2.0.0)
   - GravatarUI (2.0.0):
     - Gravatar (= 2.0.0)
-  - Gutenberg (1.120.0)
+  - Gutenberg (1.120.1)
   - Kanvas (1.4.9):
     - CropViewController
   - MediaEditor (1.2.2):
@@ -36,7 +36,7 @@ DEPENDENCIES:
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gravatar (= 2.0.0)
   - GravatarUI (= 2.0.0)
-  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.0.podspec`)
+  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
   - Kanvas (~> 1.4.4)
   - MediaEditor (>= 1.2.2, ~> 1.2)
   - Specta (= 1.0.7)
@@ -67,7 +67,7 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.0.podspec
+    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
@@ -81,7 +81,7 @@ SPEC CHECKSUMS:
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
   GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
-  Gutenberg: a0cc56d764e14caf66c8a057255106a62808dd98
+  Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
   Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
   MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 25.2
 -----
-
+* [*] Simplify post list context menu sections [#23356]
+* [*] Fix an issue with incorrect snackbar shown when saving drafts manually [#23358]
 
 25.1
 -----
@@ -9,7 +10,12 @@
 * [*] Fix an issue with a missing navigation bar background in Post Settings [#23334]
 * [*] Fix an issue where the app will sometimes save empty drafts [#23342]
 * [*] Add `.networkConnectionLost` to the list of "offline" scenarios so that the "offline changes" badge and fast retries work for this use case [#23348]
-
+* [*] If draft sync fails, the app will now show the "Retry" button in the context menu along with the error message [#23355]
+* [*] Fix an issue with post content structure not loading in some scenarios [#23347]
+* [*] Fix a rare crash when updating posts with categories [#23354]
+* [*] Fix an issue where a Page editor will not close automatically after trying to update a permanently deleted post [#23363]
+* [*] Fix an issue where you could remove the scheduled date on a scheduled post [#23360]
+* [*] The Post List screen now fetches updates faster and shows a spinner when refreshing stale data [#23362]
 
 25.0
 -----

WordPress/Classes/Services/PostCategoryService.m

@@ -165,15 +165,19 @@ - (void)mergeCategories:(NSArray <RemotePostCategory *> *)remoteCategories forBl
     NSMutableArray *categories = [NSMutableArray arrayWithCapacity:remoteCategories.count];
 
     for (RemotePostCategory *remoteCategory in remoteCategories) {
-        PostCategory *category = [PostCategory lookupWithBlogObjectID:blog.objectID categoryID:remoteCategory.categoryID inContext:context];
-        if (!category) {
-            category = [PostCategory createWithBlogObjectID:blog.objectID inContext:context];
-            category.categoryID = remoteCategory.categoryID;
-        }
-        category.categoryName = remoteCategory.name;
-        category.parentID = remoteCategory.parentID;
+        if (remoteCategory.categoryID) {
+            PostCategory *category = [PostCategory lookupWithBlogObjectID:blog.objectID categoryID:remoteCategory.categoryID inContext:context];
+            if (!category) {
+                category = [PostCategory createWithBlogObjectID:blog.objectID inContext:context];
+                category.categoryID = remoteCategory.categoryID;
+            }
+            category.categoryName = remoteCategory.name;
+            if (remoteCategory.parentID) {
+                category.parentID = remoteCategory.parentID;
+            }
 
-        [categories addObject:category];
+            [categories addObject:category];
+        }
     }
 }
 

WordPress/Classes/Services/PostCoordinator+Notices.swift

@@ -48,14 +48,15 @@ private enum Strings {
     static let view = NSLocalizedString("postNotice.view", value: "View", comment: "Button title. Displays a summary / sharing screen for a specific post.")
 
     static func publishSuccessTitle(for post: AbstractPost, isUpdated: Bool = false) -> String {
+        if post.status == .draft {
+            return NSLocalizedString("postNotice.draftSaved", value: "Draft Saved", comment: "Title of notification displayed when either a new or an existing draft is saved")
+        }
         switch post {
         case let post as Post:
             guard !isUpdated else {
                 return NSLocalizedString("postNotice.postUpdated", value: "Post updated", comment: "Title of notification displayed when a post has been successfully updated.")
             }
             switch post.status {
-            case .draft:
-                return NSLocalizedString("postNotice.postDraftCreated", value: "Post draft uploaded", comment: "Title of notification displayed when a post has been successfully saved as a draft.")
             case .scheduled:
                 return NSLocalizedString("postNotice.postScheduled", value: "Post scheduled", comment: "Title of notification displayed when a post has been successfully scheduled.")
             case .pending:
@@ -68,8 +69,6 @@ private enum Strings {
                 return NSLocalizedString("postNotice.pageUpdated", value: "Page updated", comment: "Title of notification displayed when a page has been successfully updated.")
             }
             switch page.status {
-            case .draft:
-                return NSLocalizedString("postNotice.pageDraftCreated", value: "Page draft uploaded", comment: "Title of notification displayed when a page has been successfully saved as a draft.")
             case .scheduled:
                 return NSLocalizedString("postNotice.pageScheduled", value: "Page scheduled", comment: "Title of notification displayed when a page has been successfully scheduled.")
             case .pending:
@@ -78,7 +77,7 @@ private enum Strings {
                 return NSLocalizedString("postNotice.pagePublished", value: "Page published", comment: "Title of notification displayed when a page has been successfully published.")
             }
         default:
-            assertionFailure("Unexpected post type: \(post)")
+            wpAssertionFailure("unexpected post type", userInfo: ["post_type": String(describing: type(of: post))])
             return ""
         }
     }

WordPress/Classes/Services/PostCoordinator.swift

@@ -13,8 +13,10 @@ protocol PostCoordinatorDelegate: AnyObject {
 class PostCoordinator: NSObject {
 
     enum SavingError: Error, LocalizedError, CustomNSError {
+        /// One of the media uploads failed.
         case mediaFailure(AbstractPost, Error)
-        case unknown
+        /// The upload has been failing for too long.
+        case maximumRetryTimeIntervalReached
 
         var errorDescription: String? {
             Strings.genericErrorTitle
@@ -24,7 +26,7 @@ class PostCoordinator: NSObject {
             switch self {
             case .mediaFailure(_, let error):
                 return [NSUnderlyingErrorKey: error]
-            case .unknown:
+            case .maximumRetryTimeIntervalReached:
                 return [:]
             }
         }
@@ -52,8 +54,8 @@ class PostCoordinator: NSObject {
     private let mediaCoordinator: MediaCoordinator
     private let actionDispatcherFacade: ActionDispatcherFacade
 
-    /// The initial sync retry delay. By default, 8 seconds.
-    var syncRetryDelay: TimeInterval = 8
+    /// The initial sync retry delay. By default, 15 seconds.
+    var syncRetryDelay: TimeInterval = 15
 
     // MARK: - Initializers
 
@@ -293,6 +295,19 @@ class PostCoordinator: NSObject {
         startSync(for: revision.original())
     }
 
+    func retrySync(for post: AbstractPost) {
+        wpAssert(post.isOriginal())
+
+        guard let revision = post.getLatestRevisionNeedingSync() else {
+            return
+        }
+        revision.confirmedChangesTimestamp = Date()
+        ContextManager.shared.saveContextAndWait(coreDataStack.mainContext)
+
+        getWorker(for: post).showNextError = true
+        startSync(for: post)
+    }
+
     /// Schedules sync for all the posts with revisions that need syncing.
     ///
     /// - note: It should typically only be called once during the app launch.
@@ -354,20 +369,23 @@ class PostCoordinator: NSObject {
 
     /// A manages sync for the given post. Every post has its own worker.
     private final class SyncWorker {
+        /// Defines for how many days (in seconds) the app should continue trying
+        /// to upload the post before giving up and requiring manual intervention.
+        static let maximumRetryTimeInterval: TimeInterval = 86400 * 3 // 3 days
+
         let post: AbstractPost
         var isPaused = false
         var operation: SyncOperation? // The sync operation that's currently running
         var error: Error? // The previous sync error
 
         var nextRetryDelay: TimeInterval {
-            retryDelay = min(60, retryDelay * 2)
+            retryDelay = min(120, retryDelay * 2)
             return retryDelay
         }
-        func setLongerDelay() {
-            retryDelay = max(retryDelay, 30)
-        }
+
         var retryDelay: TimeInterval
         weak var retryTimer: Timer?
+        var showNextError = false
 
         deinit {
             self.log("deinit")
@@ -440,6 +458,13 @@ class PostCoordinator: NSObject {
 
         let worker = getWorker(for: post)
 
+        if let date = revision.confirmedChangesTimestamp,
+           Date.now.timeIntervalSince(date) > SyncWorker.maximumRetryTimeInterval {
+            worker.error = PostCoordinator.SavingError.maximumRetryTimeIntervalReached
+            postDidUpdateNotification(for: post)
+            return worker.log("stopping – failing to upload changes for too long")
+        }
+
         guard !worker.isPaused else {
             return worker.log("start failed: worker is paused")
         }
@@ -525,8 +550,9 @@ class PostCoordinator: NSObject {
             worker.error = error
             postDidUpdateNotification(for: operation.post)
 
-            if PostCoordinator.isTerminalError(error) {
-                worker.setLongerDelay()
+            if worker.showNextError {
+                worker.showNextError = false
+                handleError(error, for: operation.post)
             }
 
             let delay = worker.nextRetryDelay
@@ -544,21 +570,6 @@ class PostCoordinator: NSObject {
         }
     }
 
-    /// Returns `true` if the error can't be resolved by simply retrying and
-    /// requires user interventions, for example, resolving a conflict.
-    static func isTerminalError(_ error: Error) -> Bool {
-        if let saveError = error as? PostRepository.PostSaveError {
-            switch saveError {
-            case .deleted, .conflict:
-                return true
-            }
-        }
-        if let error = error as? SavingError, case .mediaFailure(_, let error) = error {
-            return MediaCoordinator.isTerminalError(error)
-        }
-        return false
-    }
-
     private func didRetryTimerFire(for worker: SyncWorker) {
         worker.log("retry timer fired")
         startSync(for: worker.post)

WordPress/Classes/Services/PostHelper+Metadata.swift

@@ -11,4 +11,22 @@ extension PostHelper {
             value: dictionary["value"] as? String
         )
     }
+
+    @objc(createOrUpdateCategoryForRemoteCategory:blog:context:)
+    class func createOrUpdateCategory(for remoteCategory: RemotePostCategory, in blog: Blog, in context: NSManagedObjectContext) -> PostCategory? {
+        guard let categoryID = remoteCategory.categoryID else {
+            wpAssertionFailure("remote category missing categoryID")
+            return nil
+        }
+        if let category = try? PostCategory.lookup(withBlogID: blog.objectID, categoryID: categoryID, in: context) {
+            return category
+        }
+        let category = PostCategory(context: context)
+        // - warning: these PostCategory fields are explicitly unwrapped optionals!
+        category.blog = blog
+        category.categoryID = categoryID
+        category.categoryName = remoteCategory.name ?? ""
+        category.parentID = remoteCategory.parentID ?? 0 // `0` means "no parent"
+        return category
+    }
 }