merge branch trunk into task/19570-migration-notifications-screen-ui

Author: Giorgio Ruscigno

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+21.3
+-----
+* [*] Fixed a minor UI issue where the segmented control under My SIte was being clipped when "Home" is selected. [#19595]
+
 21.2
 -----
 * [*] [internal] Refactored fetching posts in the Reader tab. [#19539]

WordPress/Classes/Extensions/UIImageView+SiteIcon.swift

@@ -11,21 +11,14 @@ extension UIImageView {
     /// Default Settings
     ///
     struct SiteIconDefaults {
-
         /// Default SiteIcon's Image Size, in points.
         ///
-        static let imageSize = 40
-
-        /// Default SiteIcon's Image Size, in pixels.
-        ///
-        static var imageSizeInPixels: Int {
-            return imageSize * Int(UIScreen.main.scale)
-        }
+        static let imageSize = CGSize(width: 40, height: 40)
     }
 
 
     /// Downloads the SiteIcon Image, hosted at the specified path. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// TODO: This is a convenience method. Nuke me once we're all swifted.
     ///
@@ -38,35 +31,42 @@ extension UIImageView {
 
 
     /// Downloads the SiteIcon Image, hosted at the specified path. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// - Parameters:
     ///     - path: SiteIcon's url (string encoded) to be downloaded.
+    ///     - imageSize: Request site icon in the specified image size.
     ///     - placeholderImage: Yes. It's the "place holder image", Sherlock.
     ///
     @objc
-    func downloadSiteIcon(at path: String, placeholderImage: UIImage?) {
-        guard let siteIconURL = optimizedURL(for: path) else {
+    func downloadSiteIcon(
+        at path: String,
+        imageSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage?
+    ) {
+        guard let siteIconURL = optimizedURL(for: path, imageSize: imageSize) else {
             image = placeholderImage
             return
         }
 
         logURLOptimization(from: path, to: siteIconURL)
 
         let request = URLRequest(url: siteIconURL)
-        downloadSiteIcon(with: request, placeholderImage: placeholderImage)
+        downloadSiteIcon(with: request, imageSize: imageSize, placeholderImage: placeholderImage)
     }
 
     /// Downloads a SiteIcon image, using a specified request.
     ///
     /// - Parameters:
-    ///     - request: the request for the SiteIcon.
+    ///     - request: The request for the SiteIcon.
+    ///     - imageSize: Request site icon in the specified image size.
     ///     - placeholderImage: Yes. It's the "place holder image".
     ///
     private func downloadSiteIcon(
         with request: URLRequest,
-        placeholderImage: UIImage?) {
-
+        imageSize expectedSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage?
+    ) {
         af_setImage(withURLRequest: request, placeholderImage: placeholderImage, completion: { [weak self] dataResponse in
             switch dataResponse.result {
             case .success(let image):
@@ -82,8 +82,6 @@ extension UIImageView {
                 // The following lines of code ensure that we resize the image to the default Site Icon size, to
                 // ensure there is no UI breakage due to having larger images set here.
                 //
-                let expectedSize = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-
                 if image.size != expectedSize {
                     self.image = image.resizedImage(with: .scaleAspectFill, bounds: expectedSize, interpolationQuality: .default)
                 } else {
@@ -103,19 +101,21 @@ extension UIImageView {
 
 
     /// Downloads the SiteIcon Image, associated to a given Blog. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// - Parameters:
     ///     - blog: reference to the source blog
     ///     - placeholderImage: Yes. It's the "place holder image".
     ///
-    @objc
-    func downloadSiteIcon(for blog: Blog, placeholderImage: UIImage? = .siteIconPlaceholder) {
-        guard let siteIconPath = blog.icon, let siteIconURL = optimizedURL(for: siteIconPath) else {
+    @objc func downloadSiteIcon(
+        for blog: Blog,
+        imageSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage? = .siteIconPlaceholder
+    ) {
+        guard let siteIconPath = blog.icon, let siteIconURL = optimizedURL(for: siteIconPath, imageSize: imageSize) else {
 
             if blog.isWPForTeams() && placeholderImage == .siteIconPlaceholder {
-                let standardSize = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-                image = UIImage.gridicon(.p2, size: standardSize)
+                image = UIImage.gridicon(.p2, size: imageSize)
                 return
             }
 
@@ -135,7 +135,7 @@ extension UIImageView {
             for: siteIconURL,
             from: host,
             onComplete: { [weak self] request in
-                self?.downloadSiteIcon(with: request, placeholderImage: placeholderImage)
+                self?.downloadSiteIcon(with: request, imageSize: imageSize, placeholderImage: placeholderImage)
         }) { error in
             DDLogError(error.localizedDescription)
         }
@@ -148,28 +148,28 @@ extension UIImageView {
 extension UIImageView {
     /// Returns the Size Optimized URL for a given Path.
     ///
-    func optimizedURL(for path: String) -> URL? {
+    func optimizedURL(for path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
         if isPhotonURL(path) || isDotcomURL(path) {
-            return optimizedDotcomURL(from: path)
+            return optimizedDotcomURL(from: path, imageSize: imageSize)
         }
 
         if isBlavatarURL(path) {
-            return optimizedBlavatarURL(from: path)
+            return optimizedBlavatarURL(from: path, imageSize: imageSize)
         }
 
-        return optimizedPhotonURL(from: path)
+        return optimizedPhotonURL(from: path, imageSize: imageSize)
     }
 
 
     // MARK: - Private Helpers
 
-    /// Returns the download URL for a square icon with a size of `SiteIconDefaults.imageSizeInPixels`
+    /// Returns the download URL for a square icon with a size of `imageSize` in pixels.
     ///
     /// - Parameter path: SiteIcon URL (string encoded).
     ///
-    private func optimizedDotcomURL(from path: String) -> URL? {
-        let size = SiteIconDefaults.imageSizeInPixels
-        let query = String(format: "w=%d&h=%d", size, size)
+    private func optimizedDotcomURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
+        let size = imageSize.toPixels()
+        let query = String(format: "w=%d&h=%d", Int(size.width), Int(size.height))
 
         return parseURL(path: path, query: query)
     }
@@ -179,9 +179,9 @@ extension UIImageView {
     ///
     /// - Parameter path: Blavatar URL (string encoded).
     ///
-    private func optimizedBlavatarURL(from path: String) -> URL? {
-        let size = SiteIconDefaults.imageSizeInPixels
-        let query = String(format: "d=404&s=%d", size)
+    private func optimizedBlavatarURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
+        let size = imageSize.toPixels()
+        let query = String(format: "d=404&s=%d", Int(max(size.width, size.height)))
 
         return parseURL(path: path, query: query)
     }
@@ -191,13 +191,12 @@ extension UIImageView {
     ///
     /// - Parameter siteIconPath: SiteIcon URL (string encoded).
     ///
-    private func optimizedPhotonURL(from path: String) -> URL? {
+    private func optimizedPhotonURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
         guard let url = URL(string: path) else {
             return nil
         }
 
-        let size = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-        return PhotonImageURLHelper.photonURL(with: size, forImageURL: url)
+        return PhotonImageURLHelper.photonURL(with: imageSize, forImageURL: url)
     }
 
 
@@ -267,3 +266,19 @@ private extension UIImageView {
         DDLogInfo("URL optimized from \(original) to \(optimized.absoluteString) for blog \(blogInfo)")
     }
 }
+
+// MARK: - CGFloat Extension
+
+private extension CGSize {
+
+    func toPixels() -> CGSize {
+        return CGSize(width: width.toPixels(), height: height.toPixels())
+    }
+}
+
+private extension CGFloat {
+
+    func toPixels() -> CGFloat {
+        return self * UIScreen.main.scale
+    }
+}

WordPress/Classes/Services/NotificationFilteringService.swift

@@ -0,0 +1,71 @@
+import Foundation
+
+/// The service is created to support disabling WordPress notifications when Jetpack app is installed
+/// The service uses App Groups which allows Jetpack app to change the state of notifications flag and be later accessed by WordPress app
+/// This is a temporary solution to avoid duplicate notifications during the migration process from WordPress to Jetpack app
+/// This service and its usage can be deleted once the migration is done
+final class NotificationFilteringService {
+    private var notificationSettingsLoader: NotificationSettingsLoader
+    private var notificationsEnabled: Bool = false
+    private let allowDisablingWPNotifications: Bool
+    private let isWordPress: Bool
+    private let userDefaults = UserDefaults(suiteName: WPAppGroupName)
+
+    var wordPressNotificationsEnabled: Bool {
+        get {
+            guard let userDefaults = userDefaults,
+                  userDefaults.value(forKey: WPNotificationsEnabledKey) != nil else {
+                /// Treat this flag as enabled if it wasn't explicitly disabled
+                return true
+            }
+
+            return userDefaults.bool(forKey: WPNotificationsEnabledKey)
+        }
+
+        set {
+            userDefaults?.set(newValue, forKey: WPNotificationsEnabledKey)
+        }
+    }
+
+    init(notificationSettingsLoader: NotificationSettingsLoader = UNUserNotificationCenter.current(),
+         allowDisablingWPNotifications: Bool = FeatureFlag.allowDisablingWPNotifications.enabled,
+         isWordPress: Bool = AppConfiguration.isWordPress) {
+        self.notificationSettingsLoader = notificationSettingsLoader
+        self.allowDisablingWPNotifications = allowDisablingWPNotifications
+        self.isWordPress = isWordPress
+
+        notificationSettingsLoader.getNotificationAuthorizationStatus { [weak self] status in
+            self?.notificationsEnabled = status == .authorized
+        }
+    }
+
+    func shouldShowNotificationControl() -> Bool {
+        return allowDisablingWPNotifications && isWordPress && notificationsEnabled
+    }
+
+    func disableWordPressNotificationsIfNeeded() {
+        if allowDisablingWPNotifications, !isWordPress {
+            wordPressNotificationsEnabled = false
+        }
+    }
+
+    func shouldFilterWordPressNotifications() -> Bool {
+        return allowDisablingWPNotifications
+            && isWordPress
+            && !wordPressNotificationsEnabled
+    }
+}
+
+// MARK: - Helpers
+
+protocol NotificationSettingsLoader: AnyObject {
+    func getNotificationAuthorizationStatus(completionHandler: @escaping (UNAuthorizationStatus) -> Void)
+}
+
+extension UNUserNotificationCenter: NotificationSettingsLoader {
+    func getNotificationAuthorizationStatus(completionHandler: @escaping (UNAuthorizationStatus) -> Void) {
+        getNotificationSettings { settings in
+            completionHandler(settings.authorizationStatus)
+        }
+    }
+}

WordPress/Classes/System/Constants.h

@@ -41,6 +41,7 @@ extern NSString *const WPNotificationServiceExtensionKeychainServiceName;
 extern NSString *const WPNotificationServiceExtensionKeychainTokenKey;
 extern NSString *const WPNotificationServiceExtensionKeychainUsernameKey;
 extern NSString *const WPNotificationServiceExtensionKeychainUserIDKey;
+extern NSString *const WPNotificationsEnabledKey;
 
 /// Share Extension Constants
 ///

WordPress/Classes/System/Constants.m

@@ -47,6 +47,7 @@
 NSString *const WPNotificationServiceExtensionKeychainTokenKey      = @"OAuth2Token";
 NSString *const WPNotificationServiceExtensionKeychainUsernameKey   = @"Username";
 NSString *const WPNotificationServiceExtensionKeychainUserIDKey     = @"UserID";
+NSString *const WPNotificationsEnabledKey                           = @"WordPressNotificationsEnabled";
 
 /// Share Extension Constants
 ///

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -37,6 +37,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
     case newJetpackLandingScreen
     case newWordPressLandingScreen
     case newCoreDataContext
+    case allowDisablingWPNotifications
     case jetpackFeaturesRemovalPhaseOne
     case jetpackFeaturesRemovalPhaseTwo
     case jetpackFeaturesRemovalPhaseThree
@@ -124,6 +125,8 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
             return false
         case .newCoreDataContext:
             return true
+        case .allowDisablingWPNotifications:
+            return false
         case .jetpackFeaturesRemovalPhaseOne:
             return false
         case .jetpackFeaturesRemovalPhaseTwo:
@@ -154,6 +157,8 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
             return "jp_removal_four"
         case .jetpackFeaturesRemovalPhaseNewUsers:
             return "jp_removal_new_users"
+        case .allowDisablingWPNotifications:
+            return "prevent_duplicate_notifs_remote_field"
             default:
                 return nil
         }
@@ -244,6 +249,8 @@ extension FeatureFlag {
             return "New WordPress landing screen"
         case .newCoreDataContext:
             return "Use new Core Data context structure (Require app restart)"
+        case .allowDisablingWPNotifications:
+            return "Disable WordPress app notifications when Jetpack is installed"
         case .jetpackFeaturesRemovalPhaseOne:
             return "Jetpack Features Removal Phase One"
         case .jetpackFeaturesRemovalPhaseTwo:

WordPress/Classes/Utility/InteractiveNotificationsManager.swift

@@ -60,10 +60,11 @@ final class InteractiveNotificationsManager: NSObject {
         let options: UNAuthorizationOptions = [.badge, .sound, .alert, .providesAppNotificationSettings]
 
         let notificationCenter = UNUserNotificationCenter.current()
-        notificationCenter.requestAuthorization(options: options) { (allowed, _)  in
+        notificationCenter.requestAuthorization(options: options) { [weak self] (allowed, _)  in
             DispatchQueue.main.async {
                 if allowed {
                     WPAnalytics.track(.pushNotificationOSAlertAllowed)
+                    self?.disableWordPressNotificationsIfNeeded()
                 } else {
                     WPAnalytics.track(.pushNotificationOSAlertDenied)
                 }
@@ -687,3 +688,12 @@ extension InteractiveNotificationsManager: UNUserNotificationCenterDelegate {
         MeNavigationAction.notificationSettings.perform(router: UniversalLinkRouter.shared)
     }
 }
+
+private extension InteractiveNotificationsManager {
+    /// A temporary setting to allow controlling WordPress notifications when they are disabled after Jetpack installation
+    /// Disable WordPress notifications when they are enabled on Jetpack
+    func disableWordPressNotificationsIfNeeded() {
+        let notificationFilteringService = NotificationFilteringService()
+        notificationFilteringService.disableWordPressNotificationsIfNeeded()
+    }
+}

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

@@ -844,6 +844,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         blogDashboardViewController.update(blog: blog)
         embedChildInStackView(blogDashboardViewController)
         self.blogDashboardViewController = blogDashboardViewController
+        stackView.sendSubviewToBack(blogDashboardViewController.view)
     }
 
     // MARK: - Model Changes