Merge branch 'trunk' into iangmaia/add-release-version-validation

Author: AliSoftware

Modules/Package.resolved

@@ -53,7 +53,7 @@ let package = Package(
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
         .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250926"),
-        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.8.1-alpha.2"),
+        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.9.0"),
         .package(
             url: "https://github.com/Automattic/color-studio",
             revision: "bf141adc75e2769eb469a3e095bdc93dc30be8de"

Modules/Package.swift

@@ -1,6 +1,5 @@
 import XCTest
 import WordPressData
-import UserNotifications
 @testable import WordPress
 
 final class NotificationsViewControllerTests: XCTestCase {
@@ -47,7 +46,7 @@ final class NotificationsViewControllerTests: XCTestCase {
     func testResetApplicationBadgeWhenAccountChange() throws {
         // Give
         let newUnreadCount = 1
-        UNUserNotificationCenter.current().setBadgeCount(0)
+        UIApplication.shared.applicationIconBadgeNumber = 0
         ZendeskUtils.unreadNotificationsCount = newUnreadCount
 
         // When

Tests/KeystoneTests/Tests/Features/Notifications/NotificationsViewControllerTests.swift

@@ -27,6 +27,12 @@ class RemoteFeatureFlagStore {
         return deviceID
     }
 
+    /// Returns `true` if the store hasn't been updated yet. It uses the
+    /// presence of `deviceID` as an indicator of the previous install.
+    public var isFreshInstall: Bool {
+        persistenceStore.string(forKey: Constants.DeviceIdKey) == nil
+    }
+
     init(persistenceStore: UserPersistentRepository = UserDefaults.standard) {
         self.persistenceStore = persistenceStore
     }

WordPress/Classes/Stores/RemoteFeatureFlagStore.swift

@@ -28,7 +28,7 @@ extension WordPressAuthenticator: WordPressAuthenticatorProtocol {
             return false
         }
 
-        return RemoteFeatureFlag.dotComWebLogin.enabled()
+        return true
     }
 
     private static func continueWithDotCom(_ viewController: UIViewController) -> Bool {

WordPress/Classes/System/Root View/WordPressAuthenticatorProtocol.swift

@@ -533,6 +533,11 @@ extension WordPressAppDelegate {
             FeatureFlagOverrideStore().override(RemoteFeatureFlag.dotComWebLogin, withValue: true)
         }
 
+        /// - warning: must be called before the `update(using:then:)`.
+        if remoteFeatureFlagStore.isFreshInstall {
+            FeatureFlagOverrideStore().override(FeatureFlag.newStats, withValue: true)
+        }
+
         var api: WordPressComRestApi
         if let authToken {
             api = WordPressComRestApi.defaultV2Api(authToken: authToken)

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -84,7 +84,7 @@ public enum FeatureFlag: Int, CaseIterable {
         case .mediaQuotaView:
             return false
         case .intelligence:
-            let languageCode = Locale.current.languageCode
+            let languageCode = Locale.current.language.languageCode?.identifier
             return (languageCode ?? "en").hasPrefix("en")
         }
     }

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -75,7 +75,7 @@ public final class PushNotificationsManager: NSObject {
             sharedApplication.registerForRemoteNotifications()
         }
         sharedApplication.unregisterForRemoteNotifications()
-        UNUserNotificationCenter.current().setBadgeCount(0)
+        sharedApplication.applicationIconBadgeNumber = 0
         didRegisterForRemoteNotifications = false
     }
 
@@ -187,7 +187,7 @@ public final class PushNotificationsManager: NSObject {
 
         // Badge: Update
         if let badgeCountNumber = userInfo.number(forKeyPath: Notification.badgePath)?.intValue {
-            UNUserNotificationCenter.current().setBadgeCount(badgeCountNumber)
+            sharedApplication.applicationIconBadgeNumber = badgeCountNumber
         }
 
         // Badge: Reset

WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift

@@ -307,7 +307,7 @@ class ZendeskUtils: NSObject, ZendeskUtilsProtocol {
     /// - post an NSNotification so the various indicators can be cleared.
     ///
     static func pushNotificationRead() {
-        UNUserNotificationCenter.current().setBadgeCount(UIApplication.shared.applicationIconBadgeNumber - unreadNotificationsCount)
+        UIApplication.shared.applicationIconBadgeNumber -= unreadNotificationsCount
         unreadNotificationsCount = 0
         saveUnreadCount()
         postNotificationRead()

WordPress/Classes/Utility/ZendeskUtils.swift

@@ -96,4 +96,12 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle
     func editor(_ viewController: GutenbergKit.EditorViewController, didTriggerAutocompleter type: String) {
         // Do nothing
     }
+
+    func editor(_ viewController: GutenbergKit.EditorViewController, didOpenModalDialog dialogType: String) {
+        // Do nothing
+    }
+
+    func editor(_ viewController: GutenbergKit.EditorViewController, didCloseModalDialog dialogType: String) {
+        // Do nothing
+    }
 }