Merge beta 21.9.0.2

WordPress/Classes/Services/BlazeService.swift

@@ -1,7 +1,7 @@
 import Foundation
 import WordPressKit
 
-final class BlazeService {
+@objc final class BlazeService: NSObject {
 
     private let contextManager: CoreDataStack
     private let remote: BlazeServiceRemote
@@ -18,44 +18,48 @@ final class BlazeService {
         self.remote = remote ?? .init(wordPressComRestApi: account.wordPressComRestV2Api)
     }
 
+    @objc class func createService() -> BlazeService? {
+        self.init()
+    }
+
     // MARK: - Methods
 
-    /// Fetches and updates blaze status from the server.
+    /// Fetches a site's blaze status from the server, and updates the blog's isBlazeApproved property.
     ///
     /// - Parameters:
     ///   - blog: A blog
     ///   - completion: Closure to be called on success
-    func updateStatus(for blog: Blog,
-                      completion: (() -> Void)? = nil) {
+    @objc func getStatus(for blog: Blog,
+                         completion: (() -> Void)? = nil) {
+
+        guard BlazeHelper.isBlazeFlagEnabled() else {
+            updateBlog(blog, isBlazeApproved: false, completion: completion)
+            return
+        }
+
         guard let siteId = blog.dotComID?.intValue else {
             DDLogError("Invalid site ID for Blaze")
-            completion?()
+            updateBlog(blog, isBlazeApproved: false, completion: completion)
             return
         }
 
         remote.getStatus(forSiteId: siteId) { result in
             switch result {
             case .success(let approved):
-
-                self.contextManager.performAndSave({ context in
-
-                    guard let blog = Blog.lookup(withObjectID: blog.objectID, in: context) else {
-                        DDLogError("Unable to update isBlazeApproved value for blog")
-                        completion?()
-                        return
-                    }
-
-                    blog.isBlazeApproved = approved
-                    DDLogInfo("Successfully updated isBlazeApproved value for blog: \(approved)")
-
-                }, completion: {
-                    completion?()
-                }, on: .main)
-
+                self.updateBlog(blog, isBlazeApproved: approved, completion: completion)
             case .failure(let error):
                 DDLogError("Unable to fetch isBlazeApproved value from remote: \(error.localizedDescription)")
-                completion?()
+                self.updateBlog(blog, isBlazeApproved: false, completion: completion)
             }
         }
     }
+
+    private func updateBlog(_ blog: Blog, isBlazeApproved: Bool, completion: (() -> Void)? = nil) {
+        contextManager.performAndSave({ context in
+            blog.isBlazeApproved = isBlazeApproved
+            DDLogInfo("Successfully updated isBlazeApproved value for blog: \(isBlazeApproved)")
+        }, completion: {
+            completion?()
+        }, on: .main)
+    }
 }

WordPress/Classes/Services/BlogService.m

@@ -185,6 +185,12 @@ - (void)syncBlogAndAllMetadata:(Blog *)blog completionHandler:(void (^)(void))co
         DDLogError(@"Failed to sync Editor settings");
         dispatch_group_leave(syncGroup);
     }];
+
+    BlazeService *blazeService = [BlazeService createService];
+    dispatch_group_enter(syncGroup);
+    [blazeService getStatusFor:blog completion:^{
+        dispatch_group_leave(syncGroup);
+    }];
 
     // When everything has left the syncGroup (all calls have ended with success
     // or failure) perform the completionHandler

WordPress/Classes/Services/CommentService.m

@@ -1048,6 +1048,7 @@ - (void)createHierarchicalCommentWithContent:(NSString *)content
     [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
         ReaderPost *post = [context existingObjectWithID:postObjectID error:nil];
         Comment *comment = [self createHierarchicalCommentWithContent:content withParent:parentID postID:post.postID siteID:siteID inContext:context];
+        objectID = comment.objectID;
         // This fixes an issue where the comment may not appear for some posts after a successful posting
         // More information: https://github.com/wordpress-mobile/WordPress-iOS/issues/13259
         comment.post = post;

WordPress/Classes/System/RootViewCoordinator.swift

@@ -34,7 +34,11 @@ class RootViewCoordinator {
     // MARK: Private instance variables
 
     private(set) var rootViewPresenter: RootViewPresenter
-    private(set) var currentAppUIType: AppUIType
+    private var currentAppUIType: AppUIType {
+        didSet {
+            updateJetpackFeaturesRemovalCoordinatorState()
+        }
+    }
     private var featureFlagStore: RemoteFeatureFlagStore
     private var windowManager: WindowManager?
 
@@ -53,6 +57,7 @@ class RootViewCoordinator {
             let meScenePresenter = MeScenePresenter()
             self.rootViewPresenter = MySitesCoordinator(meScenePresenter: meScenePresenter, onBecomeActiveTab: {})
         }
+        updateJetpackFeaturesRemovalCoordinatorState()
         updatePromptsIfNeeded()
     }
 
@@ -69,6 +74,10 @@ class RootViewCoordinator {
         }
     }
 
+    private func updateJetpackFeaturesRemovalCoordinatorState() {
+        JetpackFeaturesRemovalCoordinator.currentAppUIType = currentAppUIType
+    }
+
     // MARK: UI Reload
 
     /// Reload the UI if needed after the app has already been launched.

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -516,20 +516,19 @@ extension WordPressAppDelegate {
             return
         }
 
-        // When a counterpart WordPress/Jetpack app is detected, ensure that the router can handle the URL.
-        // Passing a URL that the router can't handle results in opening the URL in Safari, which will
-        // cause the other app to "catch" the intent — and leads to a navigation loop between the two apps.
-        //
-        // TODO: Remove this after the Universal Link routes for the WordPress app are removed.
-        //
-        // Read more: https://github.com/wordpress-mobile/WordPress-iOS/issues/19755
-        if MigrationAppDetection.isCounterpartAppInstalled {
-            // If we can handle the URL, then let the UniversalLinkRouter do it.
-            guard UniversalLinkRouter.shared.canHandle(url: url) else {
-                // Otherwise, try to convert the URL to a WP Admin link and open it in Safari.
-                WPAdminConvertibleRouter.shared.handle(url: url)
-                return
-            }
+        /// If the counterpart WordPress/Jetpack app is installed, and the URL has a wp-admin link equivalent,
+        /// bounce the wp-admin link to Safari instead.
+        ///
+        /// Passing a URL that the router couldn't handle results in opening the URL in Safari, which will
+        /// cause the other app to "catch" the intent — and leads to a navigation loop between the two apps.
+        ///
+        /// TODO: Remove this after the Universal Link routes for the WordPress app are removed.
+        ///
+        /// Read more: https://github.com/wordpress-mobile/WordPress-iOS/issues/19755
+        if MigrationAppDetection.isCounterpartAppInstalled,
+           WPAdminConvertibleRouter.shared.canHandle(url: url) {
+            WPAdminConvertibleRouter.shared.handle(url: url)
+            return
         }
 
         trackDeepLink(for: url) { url in

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

@@ -873,6 +873,10 @@ - (BlogDetailsSection *)generalSectionViewModel
                                                          [weakSelf showActivity];
                                                      }]];
     }
+
+    if ([self shouldShowBlaze]) {
+        [rows addObject:[self blazeRow]];
+    }
 
 // Temporarily disabled
 //    if ([self.blog supports:BlogFeaturePlans] && ![self.blog isWPForTeams]) {
@@ -946,18 +950,7 @@ - (BlogDetailsSection *)jetpackSectionViewModel
     }
 
     if ([self shouldShowBlaze]) {
-        CGSize iconSize = CGSizeMake(BlogDetailGridiconSize, BlogDetailGridiconSize);
-        UIImage *blazeIcon = [[UIImage imageNamed:@"icon-blaze"] resizedImage:iconSize interpolationQuality:kCGInterpolationHigh];
-        BlogDetailsRow *blazeRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Blaze", @"Noun. Links to a blog's Blaze screen.")
-                                                 accessibilityIdentifier:@"Blaze Row"
-                                                                   image:[blazeIcon imageFlippedForRightToLeftLayoutDirection]
-                                                              imageColor:nil
-                                                           renderingMode:UIImageRenderingModeAlwaysOriginal
-                                                                callback:^{
-                                                                    [weakSelf showBlaze];
-                                                                }];
-        blazeRow.showsSelectionState = NO;
-        [rows addObject:blazeRow];
+        [rows addObject:[self blazeRow]];
     }
     NSString *title = @"";
 
@@ -968,6 +961,22 @@ - (BlogDetailsSection *)jetpackSectionViewModel
     return [[BlogDetailsSection alloc] initWithTitle:title andRows:rows category:BlogDetailsSectionCategoryJetpack];
 }
 
+- (BlogDetailsRow *)blazeRow
+{
+    __weak __typeof(self) weakSelf = self;
+    CGSize iconSize = CGSizeMake(BlogDetailGridiconSize, BlogDetailGridiconSize);
+    UIImage *blazeIcon = [[UIImage imageNamed:@"icon-blaze"] resizedImage:iconSize interpolationQuality:kCGInterpolationHigh];
+    BlogDetailsRow *blazeRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Blaze", @"Noun. Links to a blog's Blaze screen.")
+                                             accessibilityIdentifier:@"Blaze Row"
+                                                               image:[blazeIcon imageFlippedForRightToLeftLayoutDirection]
+                                                          imageColor:nil
+                                                       renderingMode:UIImageRenderingModeAlwaysOriginal
+                                                            callback:^{
+                                                                [weakSelf showBlaze];
+                                                            }];
+    blazeRow.showsSelectionState = NO;
+    return blazeRow;
+}
 
 - (BlogDetailsSection *)publishTypeSectionViewModel
 {

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

@@ -132,7 +132,6 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
             createFABIfNeeded()
             updateSegmentedControl(for: newBlog, switchTabsIfNeeded: true)
             fetchPrompt(for: newBlog)
-            updateBlazeStatus(for: newBlog)
         }
 
         get {
@@ -167,7 +166,6 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         startObservingQuickStart()
         startObservingOnboardingPrompt()
         subscribeToWillEnterForeground()
-        subscribeToSiteSettingsUpdated()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -272,15 +270,6 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         NotificationCenter.default.addObserver(self, selector: #selector(handlePostPublished), name: .newPostPublished, object: nil)
     }
 
-    private func subscribeToSiteSettingsUpdated() {
-        NotificationCenter.default.addObserver(forName: NSNotification.Name.WPBlogSettingsUpdated, object: nil, queue: nil) { [weak self] _ in
-            guard let blog = self?.blog else {
-                return
-            }
-            self?.updateBlazeStatus(for: blog)
-        }
-    }
-
     private func subscribeToWillEnterForeground() {
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(displayOverlayIfNeeded),
@@ -440,7 +429,6 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         showSitePicker(for: mainBlog)
         updateNavigationTitle(for: mainBlog)
         updateSegmentedControl(for: mainBlog, switchTabsIfNeeded: true)
-        updateBlazeStatus(for: mainBlog)
     }
 
     @objc
@@ -470,15 +458,17 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
 
         switch section {
         case .siteMenu:
+
             blogDetailsViewController?.pulledToRefresh(with: refreshControl) { [weak self] in
                 guard let self = self else {
                     return
                 }
 
                 self.updateNavigationTitle(for: blog)
                 self.sitePickerViewController?.blogDetailHeaderView.blog = blog
-                self.updateBlazeStatus(for: blog)
             }
+
+
         case .dashboard:
 
             /// The dashboard’s refresh control is intentionally not tied to blog syncing in order to keep
@@ -494,7 +484,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
 
                 self.updateNavigationTitle(for: blog)
                 self.sitePickerViewController?.blogDetailHeaderView.blog = blog
-                self.updateBlazeStatus(for: blog)
+                self.blogDashboardViewController?.reloadCardsLocally()
             }
         }
 
@@ -830,9 +820,9 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
                 self.switchTab(to: .siteMenu)
             }
 
-            self.updateBlazeStatus(for: blog)
             self.updateNavigationTitle(for: blog)
             self.updateSegmentedControl(for: blog)
+            self.updateChildViewController(for: blog)
             self.createFABIfNeeded()
             self.fetchPrompt(for: blog)
 
@@ -959,20 +949,6 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         self.blog = blog
     }
 
-    // MARK: - Blaze
-
-    private func updateBlazeStatus(for blog: Blog) {
-        guard BlazeHelper.isBlazeFlagEnabled(),
-              let blazeService = BlazeService() else {
-            updateChildViewController(for: blog)
-            return
-        }
-
-        blazeService.updateStatus(for: blog) { [weak self] in
-            self?.updateChildViewController(for: blog)
-        }
-    }
-
     // MARK: - Blogging Prompts
 
     @objc func handlePostPublished() {

WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift

@@ -1200,7 +1200,7 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
                 .videoPressBlock: false,
                 .unsupportedBlockEditor: false,
                 .canEnableUnsupportedBlockEditor: false,
-                .isAudioBlockMediaUploadEnabled: false,
+                .isAudioBlockMediaUploadEnabled: !isFreeWPCom,
                 .mediaFilesCollectionBlock: false,
                 .reusableBlock: false,
                 .shouldUseFastImage: !post.blog.isPrivate(),

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

@@ -81,6 +81,8 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
         }
     }
 
+    static var currentAppUIType: RootViewCoordinator.AppUIType?
+
     static func generalPhase(featureFlagStore: RemoteFeatureFlagStore = RemoteFeatureFlagStore()) -> GeneralPhase {
         if AppConfiguration.isJetpack {
             return .normal // Always return normal for Jetpack
@@ -139,34 +141,30 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
 
     /// Used to determine if the Jetpack features are enabled based on the current app UI type.
     /// This way we ensure features are not removed before reloading the UI.
-    /// But if this function is called from a background thread, we determine if the Jetpack Features
+    /// But if the current app UI type is not set, we determine if the Jetpack Features
     /// are enabled based on the removal phase regardless of the app UI state.
-    /// Default root view coordinator is used.
     @objc
     static func jetpackFeaturesEnabled() -> Bool {
-        guard Thread.isMainThread else {
-            return shouldEnableJetpackFeatures()
-        }
-        return jetpackFeaturesEnabled(rootViewCoordinator: .shared)
+        return jetpackFeaturesEnabled(featureFlagStore: RemoteFeatureFlagStore())
     }
 
     /// Used to determine if the Jetpack features are enabled based on the current app UI type.
     /// This way we ensure features are not removed before reloading the UI.
-    /// But if this function is called from a background thread, we determine if the Jetpack Features
+    /// But if the current app UI type is not set, we determine if the Jetpack Features
     /// are enabled based on the removal phase regardless of the app UI state.
     /// Using two separate methods (rather than one method with a default argument) because Obj-C.
     /// - Returns: `true` if UI type is normal, and `false` if UI type is simplified.
-    static func jetpackFeaturesEnabled(rootViewCoordinator: RootViewCoordinator) -> Bool {
-        guard Thread.isMainThread else {
-            return shouldEnableJetpackFeatures()
+    static func jetpackFeaturesEnabled(featureFlagStore: RemoteFeatureFlagStore) -> Bool {
+        guard let currentAppUIType else {
+            return shouldEnableJetpackFeatures(featureFlagStore: featureFlagStore)
         }
-        return rootViewCoordinator.currentAppUIType == .normal
+        return currentAppUIType == .normal
     }
 
 
     /// Used to determine if the Jetpack features are enabled based on the removal phase regardless of the app UI state.
-    private static func shouldEnableJetpackFeatures(featureFlagStore: RemoteFeatureFlagStore = RemoteFeatureFlagStore()) -> Bool {
-        let phase = generalPhase()
+    private static func shouldEnableJetpackFeatures(featureFlagStore: RemoteFeatureFlagStore) -> Bool {
+        let phase = generalPhase(featureFlagStore: featureFlagStore)
         switch phase {
         case .four, .newUsers, .selfHosted:
             return false