Merge 21.3 fixes & editorialized release notes to trunk

Podfile

@@ -179,7 +179,7 @@ abstract_target 'Apps' do
   ## Gutenberg (React Native)
   ## =====================
   ##
-  gutenberg tag: 'v1.85.0'
+  gutenberg tag: 'v1.85.1'
 
   ## Third party libraries
   ## =====================

WordPress/Classes/Extensions/UIApplication+AppAvailability.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+enum AppScheme: String {
+    case wordpress = "wordpress://"
+    case wordpressMigrationV1 = "wordpressmigration+v1://"
+}
+
+extension UIApplication {
+    func canOpen(app: AppScheme) -> Bool {
+        guard let url = URL(string: app.rawValue) else {
+            return false
+        }
+        return canOpenURL(url)
+    }
+}

WordPress/Classes/Services/JetpackNotificationMigrationService.swift

@@ -11,12 +11,14 @@ protocol JetpackNotificationMigrationServiceProtocol {
 final class JetpackNotificationMigrationService: JetpackNotificationMigrationServiceProtocol {
     private let remoteNotificationRegister: RemoteNotificationRegister
     private let featureFlagStore: RemoteFeatureFlagStore
+    private let userDefaults: UserDefaults
     private let isWordPress: Bool
 
     static let shared = JetpackNotificationMigrationService()
 
     static let wordPressScheme = "wordpressnotificationmigration"
     static let jetpackScheme = "jetpacknotificationmigration"
+    private let wordPressNotificationsToggledDefaultsKey = "wordPressNotificationsToggledDefaultsKey"
     private let jetpackNotificationMigrationDefaultsKey = "jetpackNotificationMigrationDefaultsKey"
 
     private var jetpackMigrationPreventDuplicateNotifications: Bool {
@@ -38,6 +40,8 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer
         }
 
         set {
+            userDefaults.set(true, forKey: wordPressNotificationsToggledDefaultsKey)
+
             if newValue, isWordPress {
                 remoteNotificationRegister.registerForRemoteNotifications()
                 rescheduleLocalNotifications()
@@ -63,18 +67,20 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer
     /// disableWordPressNotificationsFromJetpack may get triggered multiple times from Jetpack app but it only needs to be executed the first time
     private var isMigrationDone: Bool {
         get {
-            return UserDefaults.standard.bool(forKey: jetpackNotificationMigrationDefaultsKey)
+            return userDefaults.bool(forKey: jetpackNotificationMigrationDefaultsKey)
         }
         set {
-            UserDefaults.standard.setValue(newValue, forKey: jetpackNotificationMigrationDefaultsKey)
+            userDefaults.setValue(newValue, forKey: jetpackNotificationMigrationDefaultsKey)
         }
     }
 
     init(remoteNotificationRegister: RemoteNotificationRegister = UIApplication.shared,
          featureFlagStore: RemoteFeatureFlagStore = RemoteFeatureFlagStore(),
+         userDefaults: UserDefaults = .standard,
          isWordPress: Bool = AppConfiguration.isWordPress) {
         self.remoteNotificationRegister = remoteNotificationRegister
         self.featureFlagStore = featureFlagStore
+        self.userDefaults = userDefaults
         self.isWordPress = isWordPress
     }
 
@@ -85,6 +91,7 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer
     func shouldPresentNotifications() -> Bool {
         let disableNotifications = jetpackMigrationPreventDuplicateNotifications
             && isWordPress
+            && userDefaults.bool(forKey: wordPressNotificationsToggledDefaultsKey)
             && !wordPressNotificationsEnabled
 
         if disableNotifications {

WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift

@@ -15,6 +15,7 @@ private enum UPRUConstants {
     static let currentAnnouncementsKey = "currentAnnouncements"
     static let currentAnnouncementsDateKey = "currentAnnouncementsDate"
     static let announcementsVersionDisplayedKey = "announcementsVersionDisplayed"
+    static let isJPContentImportCompleteKey = "jetpackContentImportComplete"
 }
 
 protocol UserPersistentRepositoryUtility: AnyObject {
@@ -164,4 +165,13 @@ extension UserPersistentRepositoryUtility {
             UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.announcementsVersionDisplayedKey)
         }
     }
+
+    var isJPContentImportComplete: Bool {
+        get {
+            return UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.isJPContentImportCompleteKey)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.isJPContentImportCompleteKey)
+        }
+    }
 }

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -196,6 +196,13 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         uploadsManager.resume()
         updateFeatureFlags()
         updateRemoteConfig()
+
+        #if JETPACK
+        if let windowManager = windowManager as? JetpackWindowManager,
+           windowManager.shouldImportMigrationData {
+            windowManager.importAndShowMigrationContent(nil, failureCompletion: nil)
+        }
+        #endif
     }
 
     func applicationWillResignActive(_ application: UIApplication) {

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -415,6 +415,11 @@ import Foundation
     case jetpackSiteCreationOverlayButtonTapped
     case jetpackSiteCreationOverlayDismissed
 
+    // WordPress to Jetpack Migration
+    case migrationEmailTriggered
+    case migrationEmailSent
+    case migrationEmailFailed
+
     /// A String that represents the event
     var value: String {
         switch self {
@@ -1123,6 +1128,15 @@ import Foundation
             return "remove_site_creation_overlay_button_tapped"
         case .jetpackSiteCreationOverlayDismissed:
             return "remove_site_creation_overlay_dismissed"
+
+        // WordPress to Jetpack Migration
+        case .migrationEmailTriggered:
+            return "migration_email_triggered"
+        case .migrationEmailSent:
+            return "migration_email_sent"
+        case .migrationEmailFailed:
+            return "migration_email_failed"
+
         } // END OF SWITCH
     }
 

WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift

@@ -8,13 +8,16 @@ class ContentMigrationCoordinator {
 
     // MARK: Dependencies
 
+    private let coreDataStack: CoreDataStack
     private let dataMigrator: ContentDataMigrating
     private let userPersistentRepository: UserPersistentRepository
     private let eligibilityProvider: ContentMigrationEligibilityProvider
 
-    init(dataMigrator: ContentDataMigrating = DataMigrator(),
+    init(coreDataStack: CoreDataStack = ContextManager.shared,
+         dataMigrator: ContentDataMigrating = DataMigrator(),
          userPersistentRepository: UserPersistentRepository = UserDefaults.standard,
          eligibilityProvider: ContentMigrationEligibilityProvider = AppConfiguration()) {
+        self.coreDataStack = coreDataStack
         self.dataMigrator = dataMigrator
         self.userPersistentRepository = userPersistentRepository
         self.eligibilityProvider = eligibilityProvider
@@ -23,6 +26,7 @@ class ContentMigrationCoordinator {
     enum ContentMigrationCoordinatorError: Error {
         case ineligible
         case exportFailure
+        case localDraftsNotSynced
     }
 
     // MARK: Methods
@@ -41,7 +45,10 @@ class ContentMigrationCoordinator {
             return
         }
 
-        // TODO: Sync local post drafts here.
+        guard isLocalPostsSynced() else {
+            completion?(.failure(.localDraftsNotSynced))
+            return
+        }
 
         dataMigrator.exportData { result in
             switch result {
@@ -78,6 +85,26 @@ class ContentMigrationCoordinator {
     }
 }
 
+// MARK: - Preflights Local Draft Check
+
+private extension ContentMigrationCoordinator {
+
+    func isLocalPostsSynced() -> Bool {
+        let fetchRequest = NSFetchRequest<Post>(entityName: String(describing: Post.self))
+        fetchRequest.predicate = NSPredicate(format: "remoteStatusNumber = %@ || remoteStatusNumber = %@ || remoteStatusNumber = %@ || remoteStatusNumber = %@",
+                                             NSNumber(value: AbstractPostRemoteStatus.pushing.rawValue),
+                                             NSNumber(value: AbstractPostRemoteStatus.failed.rawValue),
+                                             NSNumber(value: AbstractPostRemoteStatus.local.rawValue),
+                                             NSNumber(value: AbstractPostRemoteStatus.pushingMedia.rawValue))
+        guard let count = try? coreDataStack.mainContext.count(for: fetchRequest) else {
+            return false
+        }
+
+        return count == 0
+    }
+
+}
+
 // MARK: - Content Migration Eligibility Provider
 
 protocol ContentMigrationEligibilityProvider {

WordPress/Classes/ViewRelated/Support/LogOutActionHandler.swift

@@ -2,12 +2,19 @@ import UIKit
 
 struct LogOutActionHandler {
 
+    private weak var windowManager: WindowManager?
+
+    init(windowManager: WindowManager? = WordPressAppDelegate.shared?.windowManager) {
+        self.windowManager = windowManager
+    }
+
     func logOut(with viewController: UIViewController) {
         let alert  = UIAlertController(title: logOutAlertTitle, message: nil, preferredStyle: .alert)
         alert.addActionWithTitle(Strings.alertCancelAction, style: .cancel)
         alert.addActionWithTitle(Strings.alertLogoutAction, style: .destructive) { [weak viewController] _ in
             viewController?.dismiss(animated: true) {
                 AccountHelper.logOutDefaultWordPressComAccount()
+                windowManager?.showSignInUI()
             }
         }
         viewController.present(alert, animated: true)

WordPress/Info.plist

@@ -477,6 +477,7 @@
 			<array>
 				<string>wordpress-oauth-v2</string>
 				<string>${WPCOM_SCHEME}</string>
+				<string>wordpressmigration+v1</string>
 				<string>wordpressnotificationmigration</string>
 			</array>
 		</dict>

WordPress/Jetpack/Classes/System/JetpackWindowManager.swift

@@ -5,25 +5,62 @@ class JetpackWindowManager: WindowManager {
     /// receives migration flow updates in order to dismiss it when needed.
     private var cancellable: AnyCancellable?
 
+    var shouldImportMigrationData: Bool {
+        return !AccountHelper.isLoggedIn && !UserPersistentStoreFactory.instance().isJPContentImportComplete
+    }
+
     override func showUI(for blog: Blog?) {
         // If the user is logged in and has blogs sync'd to their account
         if AccountHelper.isLoggedIn && AccountHelper.hasBlogs {
-            shouldShowMigrationUI ? showMigrationUI(blog) : showAppUI(for: blog)
+            showAppUI(for: blog)
             return
         }
 
-        // Show the sign in UI if the user isn't logged in
         guard AccountHelper.isLoggedIn else {
-            showSignInUI()
+            if shouldImportMigrationData {
+                importAndShowMigrationContent(blog) { [weak self] in
+                    self?.showSignInUI()
+                }
+            } else {
+                showSignInUI()
+            }
             return
         }
-
         // If the user doesn't have any blogs, but they're still logged in, log them out
         // the `logOutDefaultWordPressComAccount` method will trigger the `showSignInUI` automatically
         AccountHelper.logOutDefaultWordPressComAccount()
     }
 
-    private func showMigrationUI(_ blog: Blog?) {
+    func importAndShowMigrationContent(_ blog: Blog?, failureCompletion: (() -> ())?) {
+        DataMigrator().importData() { [weak self] result in
+            guard let self else {
+                return
+            }
+
+            switch result {
+            case .success:
+                UserPersistentStoreFactory.instance().isJPContentImportComplete = true
+                NotificationCenter.default.post(name: .WPAccountDefaultWordPressComAccountChanged, object: nil)
+                self.showMigrationUIIfNeeded(blog)
+                self.sendMigrationEmail()
+            case .failure:
+                failureCompletion?()
+            }
+        }
+    }
+
+    private func sendMigrationEmail() {
+        Task {
+            let service = try? MigrationEmailService()
+            try? await service?.sendMigrationEmail()
+        }
+    }
+
+    private func showMigrationUIIfNeeded(_ blog: Blog?) {
+        guard shouldShowMigrationUI else {
+            return
+        }
+
         let container = MigrationDependencyContainer()
         cancellable = container.migrationCoordinator.$currentStep
             .receive(on: DispatchQueue.main)
@@ -41,8 +78,7 @@ class JetpackWindowManager: WindowManager {
         showAppUI(for: blog)
     }
 
-    // TODO: Add logic in here to trigger migration UI if needed
     private var shouldShowMigrationUI: Bool {
-        return FeatureFlag.contentMigration.enabled
+        return FeatureFlag.contentMigration.enabled && AccountHelper.isLoggedIn
     }
 }

WordPress/Jetpack/Classes/Utility/DataMigrator.swift

@@ -4,7 +4,6 @@ protocol ContentDataMigrating {
 }
 
 enum DataMigrationError: Error {
-    case localDraftsNotSynced
     case databaseCopyError
     case sharedUserDefaultsNil
 }
@@ -81,10 +80,6 @@ final class DataMigrator {
 extension DataMigrator: ContentDataMigrating {
 
     func exportData(completion: ((Result<Void, DataMigrationError>) -> Void)? = nil) {
-        guard isLocalDraftsSynced() else {
-            completion?(.failure(.localDraftsNotSynced))
-            return
-        }
         guard let backupLocation, copyDatabase(to: backupLocation) else {
             completion?(.failure(.databaseCopyError))
             return
@@ -119,21 +114,6 @@ extension DataMigrator: ContentDataMigrating {
 
 private extension DataMigrator {
 
-    func isLocalDraftsSynced() -> Bool {
-        let fetchRequest = NSFetchRequest<Post>(entityName: String(describing: Post.self))
-        fetchRequest.predicate = NSPredicate(format: "status = %@ && (remoteStatusNumber = %@ || remoteStatusNumber = %@ || remoteStatusNumber = %@ || remoteStatusNumber = %@)",
-                                             BasePost.Status.draft.rawValue,
-                                             NSNumber(value: AbstractPostRemoteStatus.pushing.rawValue),
-                                             NSNumber(value: AbstractPostRemoteStatus.failed.rawValue),
-                                             NSNumber(value: AbstractPostRemoteStatus.local.rawValue),
-                                             NSNumber(value: AbstractPostRemoteStatus.pushingMedia.rawValue))
-        guard let count = try? coreDataStack.mainContext.count(for: fetchRequest) else {
-            return false
-        }
-
-        return count == 0
-    }
-
     func copyDatabase(to destination: URL) -> Bool {
         do {
             try coreDataStack.createStoreCopy(to: destination)