Merge pull request #19824 from wordpress-mobile/merge/24.4.0.1-into-trunk

Merge 21.4.0.1 into trunk

Author: spencertransier

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+21.5
+-----
+
+
 21.4
 -----
 * [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717]

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -329,14 +329,19 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         setupWordPressExtensions()
 
-        if FeatureFlag.contentMigration.enabled {
+        if AppConfiguration.isWordPress,
+           FeatureFlag.contentMigration.enabled {
             // To prevent race condition, initialize the shared instance synchronously so it can listen to account change notifications.
             let _ = ContentMigrationCoordinator.shared
 
-            // Start proactively exporting WP data in the background if the conditions are fulfilled.
-            // This needs to be called after `setupWordPressExtensions` because it updates the stored data.
-            DispatchQueue.global().async {
-                ContentMigrationCoordinator.shared.startOnceIfNeeded()
+            let launchUrl = launchOptions[.url] as? URL
+            let exportUrl = URL(string: "\(AppScheme.wordpressMigrationV1.rawValue)\(WordPressExportRoute().path.removingPrefix("/"))")
+            if launchUrl != exportUrl {
+                // Start proactively exporting WP data in the background if the conditions are fulfilled.
+                // This needs to be called after `setupWordPressExtensions` because it updates the stored data.
+                DispatchQueue.global().async {
+                    ContentMigrationCoordinator.shared.startOnceIfNeeded()
+                }
             }
         }
 

WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift

@@ -6,25 +6,36 @@
         .init()
     }()
 
+    var previousMigrationError: MigrationError? {
+        guard let storedErrorValue = sharedPersistentRepository?.string(forKey: .exportErrorSharedKey) else {
+            return nil
+        }
+
+        return .init(rawValue: storedErrorValue)
+    }
+
     // MARK: Dependencies
 
     private let coreDataStack: CoreDataStack
     private let dataMigrator: ContentDataMigrating
     private let notificationCenter: NotificationCenter
     private let userPersistentRepository: UserPersistentRepository
+    private let sharedPersistentRepository: UserPersistentRepository?
     private let eligibilityProvider: ContentMigrationEligibilityProvider
     private let tracker: MigrationAnalyticsTracker
 
     init(coreDataStack: CoreDataStack = ContextManager.shared,
          dataMigrator: ContentDataMigrating = DataMigrator(),
          notificationCenter: NotificationCenter = .default,
          userPersistentRepository: UserPersistentRepository = UserDefaults.standard,
+         sharedPersistentRepository: UserPersistentRepository? = UserDefaults(suiteName: WPAppGroupName),
          eligibilityProvider: ContentMigrationEligibilityProvider = AppConfiguration(),
          tracker: MigrationAnalyticsTracker = .init()) {
         self.coreDataStack = coreDataStack
         self.dataMigrator = dataMigrator
         self.notificationCenter = notificationCenter
         self.userPersistentRepository = userPersistentRepository
+        self.sharedPersistentRepository = sharedPersistentRepository
         self.eligibilityProvider = eligibilityProvider
         self.tracker = tracker
 
@@ -34,7 +45,7 @@
         ensureBackupDataDeletedOnLogout()
     }
 
-    enum ContentMigrationCoordinatorError: LocalizedError {
+    enum MigrationError: String, LocalizedError {
         case ineligible
         case exportFailure
         case localDraftsNotSynced
@@ -58,30 +69,30 @@
     /// just let the user continue with the original intent in case of failure.
     ///
     /// - Parameter completion: Closure called after the export process completes.
-    func startAndDo(completion: ((Result<Void, ContentMigrationCoordinatorError>) -> Void)? = nil) {
+    func startAndDo(completion: ((Result<Void, MigrationError>) -> Void)? = nil) {
         guard eligibilityProvider.isEligibleForMigration else {
             tracker.trackContentExportEligibility(eligible: false)
-            completion?(.failure(.ineligible))
+            processResult(.failure(.ineligible), completion: completion)
             return
         }
 
         guard isLocalPostsSynced() else {
-            let error = ContentMigrationCoordinatorError.localDraftsNotSynced
+            let error = MigrationError.localDraftsNotSynced
             tracker.trackContentExportFailed(reason: error.localizedDescription)
-            completion?(.failure(error))
+            processResult(.failure(error), completion: completion)
             return
         }
 
         dataMigrator.exportData { [weak self] result in
             switch result {
             case .success:
                 self?.tracker.trackContentExportSucceeded()
-                completion?(.success(()))
+                self?.processResult(.success(()), completion: completion)
 
             case .failure(let error):
                 DDLogError("[Jetpack Migration] Error exporting data: \(error)")
                 self?.tracker.trackContentExportFailed(reason: error.localizedDescription)
-                completion?(.failure(.exportFailure))
+                self?.processResult(.failure(.exportFailure), completion: completion)
             }
         }
     }
@@ -147,6 +158,11 @@ private extension ContentMigrationCoordinator {
     /// This prevents the user from entering the migration flow and immediately gets shown with a login pop-up (since we couldn't migrate the authToken anymore).
     ///
     func ensureBackupDataDeletedOnLogout() {
+        // we only need to listen to changes from the WordPress side.
+        guard AppConfiguration.isWordPress else {
+            return
+        }
+
         notificationCenter.addObserver(forName: .WPAccountDefaultWordPressComAccountChanged, object: nil, queue: nil) { [weak self] notification in
             // nil notification object means it's a logout event.
             guard let self,
@@ -157,6 +173,30 @@ private extension ContentMigrationCoordinator {
             self.cleanupExportedDataIfNeeded()
         }
     }
+
+    /// A "middleware" logic that attempts to record (or clear) any migration error to the App Group space
+    /// before calling the completion block.
+    ///
+    /// - Parameters:
+    ///   - result: The `Result` object from the export process.
+    ///   - completion: Closure that'll be executed after the process completes.
+    func processResult(_ result: Result<Void, MigrationError>, completion: ((Result<Void, MigrationError>) -> Void)?) {
+        // make sure that we're only intercepting from the WordPress side.
+        guard AppConfiguration.isWordPress else {
+            completion?(result)
+            return
+        }
+
+        switch result {
+        case .success:
+            sharedPersistentRepository?.removeObject(forKey: .exportErrorSharedKey)
+
+        case .failure(let error):
+            sharedPersistentRepository?.set(error.rawValue, forKey: .exportErrorSharedKey)
+        }
+
+        completion?(result)
+    }
 }
 
 // MARK: - Content Migration Eligibility Provider
@@ -176,4 +216,5 @@ extension AppConfiguration: ContentMigrationEligibilityProvider {
 
 private extension String {
     static let oneOffMigrationKey = "wordpress_one_off_export"
+    static let exportErrorSharedKey = "wordpress_shared_export_error"
 }

WordPress/Jetpack/Classes/System/JetpackWindowManager.swift

@@ -64,6 +64,11 @@ private extension JetpackWindowManager {
         MigrationAppDetection.getWordPressInstallationState() == .wordPressInstalledAndMigratable
     }
 
+    /// Checks whether the WordPress app has previously failed to export user content.
+    var hasFailedExportAttempts: Bool {
+        ContentMigrationCoordinator.shared.previousMigrationError != nil
+    }
+
     func sendMigrationEmail() {
         Task {
             let service = try? MigrationEmailService()
@@ -117,10 +122,21 @@ private extension JetpackWindowManager {
         self.show(loadWordPressViewController)
     }
 
+    /// Determine how to handle the error when the migration fails.
+    ///
+    /// Show the loadWordPress path when:
+    ///   - A compatible WordPress app version exists,
+    ///   - There's no data to import, and
+    ///   - There's no data because the export was never triggered, not because WP tried to export and failed.
+    ///
+    /// Otherwise, show the sign in flow.
+    ///
+    /// - Parameter error: Error object from the data migration process.
     func handleMigrationFailure(_ error: DataMigrationError) {
         guard
-            case .dataNotReadyToImport = error,
             isCompatibleWordPressAppPresent,
+            case .dataNotReadyToImport = error,
+            !hasFailedExportAttempts,
             let schemeUrl = URL(string: "\(AppScheme.wordpressMigrationV1.rawValue)\(WordPressExportRoute().path.removingPrefix("/"))")
         else {
             showSignInUI()

WordPress/Jetpack/Classes/Utility/DataMigrator.swift

@@ -20,7 +20,7 @@ enum DataMigrationError: LocalizedError {
 
     var errorDescription: String? {
         switch self {
-        case .databaseCopyError: return "The database couldn't be copied from shared directory"
+        case .databaseCopyError: return "The database couldn't be copied to/from shared directory"
         case .sharedUserDefaultsNil: return "Shared user defaults not found"
         case .dataNotReadyToImport: return "The data wasn't ready to import"
         }

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Load WordPress/MigrationLoadWordPressViewModel.swift

@@ -40,7 +40,7 @@ final class MigrationLoadWordPressViewModel {
             comment: "The description in the Load WordPress screen"
         )
         static let secondaryDescription = NSLocalizedString(
-            "migration.loadWordpress.description",
+            "migration.loadWordpress.secondaryDescription",
             value: "Would you like to transfer your data from the WordPress app and sign in automatically?",
             comment: "The secondary description in the Load WordPress screen"
         )

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,3 +1,8 @@
-We fixed a small visual issue with the Home and Menu control in the My Site dashboard.
+* [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717]
+* [*] Share extension navigation bar is no longer transparent [#19700]
+* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app for users migrating from the WordPress app. [#19759]
+* [***] You can now migrate your site content to the Jetpack app without a hitch. [#19759]
+* [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193]
+* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590]
+* [*] Reader now scrolls to the top if the tab bar button is tapped. [#19769]
 
-We also squashed a bug in My Site. The "Disconnect from WordPress.com” button now disconnects when tapped and will refresh the app.

WordPress/JetpackDraftActionExtension/cs.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Uložit do Jetpacku</string>
+    <key>CFBundleName</key>
+    <string>Uložit do Jetpacku</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/pl.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Zapisz w Jetpack</string>
+    <key>CFBundleName</key>
+    <string>Zapisz w Jetpacku</string>
+  </dict>
 </plist>