Merge branch 'trunk' into disable-jp-features-stock-photos-tenor

Author: fluiddot

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 21.5
 -----
 * [***] [internal] A significant refactor to the app’s architecture was made to allow for the new simplified UI. Regression testing on the app’s main flows is needed. [#19817]
+* [**] [internal] Disable Story posts when Jetpack features are removed [#19823]
 * [**] [internal] Disable StockPhoto and Tenor media sources when Jetpack features are removed [#19826]
 
 21.4

WordPress/Classes/Models/Blog.m

@@ -694,7 +694,8 @@ - (BOOL)supportsPluginManagement
 - (BOOL)supportsStories
 {
     BOOL hasRequiredJetpack = [self hasRequiredJetpackVersion:@"9.1"];
-    return hasRequiredJetpack || self.isHostedAtWPcom;
+    // Stories are disabled in iPad until this Kanvas issue is solved: https://github.com/tumblr/kanvas-ios/issues/104
+    return (hasRequiredJetpack || self.isHostedAtWPcom) && ![UIDevice isPad] && [JetpackFeaturesRemovalCoordinator jetpackFeaturesEnabled];
 }
 
 - (BOOL)supportsContactInfo

WordPress/Classes/Stores/UserPersistentRepository.swift

@@ -23,17 +23,3 @@ protocol UserPersistentRepositoryWriter: KeyValueDatabase {
 typealias UserPersistentRepository = UserPersistentRepositoryReader & UserPersistentRepositoryWriter & UserPersistentRepositoryUtility
 
 extension UserDefaults: UserPersistentRepository {}
-
-extension UserPersistentStore {
-    private static var isOneOffMigrationCompleteKey: String {
-        "defaults_one_off_migration"
-    }
-
-    var isOneOffMigrationComplete: Bool {
-        get {
-            bool(forKey: Self.isOneOffMigrationCompleteKey)
-        } set {
-            set(newValue, forKey: Self.isOneOffMigrationCompleteKey)
-        }
-    }
-}

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -329,22 +329,6 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         setupWordPressExtensions()
 
-        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
-
-            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()
-                }
-            }
-        }
-
         shortcutCreator.createShortcutsIf3DTouchAvailable(AccountHelper.isLoggedIn)
 
         AccountService.loadDefaultAccountCookies()

WordPress/Classes/Utility/ContentCoordinator.swift

@@ -89,7 +89,7 @@ struct DefaultContentCoordinator: ContentCoordinator {
     func displayBackupWithSiteID(_ siteID: NSNumber?) throws {
         guard let siteID = siteID,
               let blog = Blog.lookup(withID: siteID, in: mainContext),
-              let backupListViewController = BackupListViewController(blog: blog)
+              let backupListViewController = BackupListViewController.withJPBannerForBlog(blog)
         else {
             throw DisplayError.missingParameter
         }

WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift

@@ -97,28 +97,6 @@
         }
     }
 
-    /// Starts the content migration process from WordPress to Jetpack.
-    /// This method ensures that the migration will only be executed once per installation,
-    /// and only performed when all the conditions are fulfilled.
-    ///
-    /// Note: If the conditions are not fulfilled, this method will attempt to migrate
-    /// again on the next call.
-    ///
-    func startOnceIfNeeded(completion: (() -> Void)? = nil) {
-        if userPersistentRepository.bool(forKey: .oneOffMigrationKey) {
-            completion?()
-            return
-        }
-
-        startAndDo { [weak self] result in
-            if case .success = result {
-                self?.userPersistentRepository.set(true, forKey: .oneOffMigrationKey)
-            }
-
-            completion?()
-        }
-    }
-
     /// Attempts to clean up the exported data by re-exporting user content if they're still eligible, or deleting them otherwise.
     /// Re-exporting user content ensures that the exported data will match the latest state of Account and Blogs.
     ///
@@ -215,6 +193,5 @@ extension AppConfiguration: ContentMigrationEligibilityProvider {
 // MARK: - Constants
 
 private extension String {
-    static let oneOffMigrationKey = "wordpress_one_off_export"
     static let exportErrorSharedKey = "wordpress_shared_export_error"
 }

WordPress/Classes/ViewRelated/Activity/Backup/BackupListViewController+JetpackBannerViewController.swift

@@ -0,0 +1,18 @@
+import Foundation
+
+@objc
+extension BackupListViewController {
+    static func withJPBannerForBlog(_ blog: Blog) -> UIViewController? {
+        guard let backupListVC = BackupListViewController(blog: blog) else {
+            return nil
+        }
+        return JetpackBannerWrapperViewController(childVC: backupListVC, analyticsId: .backup)
+    }
+}
+
+extension BackupListViewController: JPScrollViewDelegate {
+    override func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        super.scrollViewDidScroll(scrollView)
+        processJetpackBannerVisibility(scrollView)
+    }
+}

WordPress/Classes/ViewRelated/Activity/Backup/BackupListViewController.swift

@@ -1,6 +1,10 @@
 import Foundation
+import Combine
 
 class BackupListViewController: BaseActivityListViewController {
+    /// Needed for JPScrollViewDelegate conformance.
+    let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
+
     override init(site: JetpackSiteRef, store: ActivityStore, isFreeWPCom: Bool = false) {
         store.onlyRestorableItems = true
 

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m

@@ -1602,7 +1602,7 @@ - (void)showScan
 
 - (void)showBackup
 {
-    BackupListViewController *controller = [[BackupListViewController alloc] initWithBlog:self.blog];
+    UIViewController *controller = [BackupListViewController withJPBannerForBlog:self.blog];
     controller.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
     [self.presentationDelegate presentBlogDetailsViewController:controller];
 }

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift

@@ -28,7 +28,7 @@ extension MySiteViewController {
 
         var actions: [ActionSheetItem] = []
 
-        if shouldShowNewStory {
+        if blog?.supports(.stories) ?? false {
             actions.append(StoryAction(handler: newStory, source: source))
         }
 
@@ -38,8 +38,4 @@ extension MySiteViewController {
         let coordinator = CreateButtonCoordinator(self, actions: actions, source: source, blog: blog)
         return coordinator
     }
-
-    private var shouldShowNewStory: Bool {
-        return (blog?.supports(.stories) ?? false) && !UIDevice.isPad()
-    }
 }