Sync branch with trunk

Author: salimbraksa

.buildkite/commands/lint-localized-strings-format.sh

@@ -0,0 +1,43 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :writing_hand: Copy Files"
+mkdir -pv ~/.configure/wordpress-ios/secrets
+cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/project.env
+
+echo "--- Lint Localized Strings Format"
+LOGS=logs.txt
+set +e
+set -o pipefail
+bundle exec fastlane generate_strings_file_for_glotpress skip_commit:true | tee $LOGS
+EXIT_CODE=$?
+set -e
+
+echo $EXIT_CODE
+
+if [[ $EXIT_CODE -ne 0 ]]; then
+  # Strings generation finished with errors, extract the errors in an easy-to-find section
+  echo "--- Report genstrings errors"
+  ERRORS=errors.txt
+  echo "Found errors when trying to run \`genstrings\` to generate the \`.strings\` files from \`*LocalizedStrings\` calls:" | tee $ERRORS
+  echo '' >> $ERRORS
+  # Print the errors inline.
+  #
+  # Notice the second `sed` call that removes the ANSI escape sequences that
+  # Fastlane uses to color the output.
+  grep -e "\[.*\].*genstrings:" $LOGS \
+    | sed -e 's/\[.*\].*genstrings: error: /- /' \
+    | sed -e $'s/\x1b\[[0-9;]*m//g' \
+    | sort \
+    | uniq \
+    | tee -a $ERRORS
+  # Annotate the build with the errors
+  cat $ERRORS | buildkite-agent annotate --style error --context genstrings
+fi
+
+exit $EXIT_CODE

.buildkite/pipeline.yml

@@ -123,3 +123,10 @@ steps:
         plugins: *common_plugins
         agents:
           queue: "android"
+      # Runs the `.strings` generation automation to ensure all the
+      # `LocalizedString` calls in the code can be correctly parsed by Apple's
+      # `genstrings`.
+      - label: "Lint Localized Strings Format"
+        command: .buildkite/commands/lint-localized-strings-format.sh
+        plugins: *common_plugins
+        env: *common_env

Podfile

@@ -218,7 +218,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.7-beta.1'
+  pod 'WPMediaPicker', '~> 1.8.7'
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
   ## while PR is in review:
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''

Podfile.lock

@@ -64,15 +64,15 @@ PODS:
     - RNTAztecView
   - JTAppleCalendar (8.0.3)
   - Kanvas (1.4.4)
-  - libwebp (1.2.3):
-    - libwebp/demux (= 1.2.3)
-    - libwebp/mux (= 1.2.3)
-    - libwebp/webp (= 1.2.3)
-  - libwebp/demux (1.2.3):
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
     - libwebp/webp
-  - libwebp/mux (1.2.3):
+  - libwebp/mux (1.2.4):
     - libwebp/demux
-  - libwebp/webp (1.2.3)
+  - libwebp/webp (1.2.4)
   - MediaEditor (1.2.1):
     - CropViewController (~> 2.5.3)
   - MRProgress (0.8.3):
@@ -512,7 +512,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.5)
-  - WPMediaPicker (1.8.7-beta.1)
+  - WPMediaPicker (1.8.7)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -605,7 +605,7 @@ DEPENDENCIES:
   - WordPressKit (>= 4.58.2, ~> 4.58)
   - WordPressShared (~> 1.18.0)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.7-beta.1)
+  - WPMediaPicker (~> 1.8.7)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -807,7 +807,7 @@ SPEC CHECKSUMS:
   Gutenberg: 387b010e396588027538e351899bf1cc730a7009
   JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99
   Kanvas: f932eaed3d3f47aae8aafb6c2d27c968bdd49030
-  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a
   MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09
   NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
@@ -868,7 +868,7 @@ SPEC CHECKSUMS:
   WordPressKit: d8bc00bce09273fc241cf171b0e61ef8f4f29479
   WordPressShared: e5a479220643f46dc4d7726ef8dd45f18bf0c53b
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
-  WPMediaPicker: 59135aebb058a95a507045f93e478516729e5c0f
+  WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -880,6 +880,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 936784ec2e9d8246acccd6b123c0ba5b1b6e13b9
+PODFILE CHECKSUM: e4762593ef0d1097286d309c828f611976c1e771
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,3 +1,9 @@
+21.3
+-----
+* [*] [internal] Blogging Reminders notifications and scheduling can be turned off for WordPress as part of Jetpack focus behind a feature flag. [#19611]
+* [*] [internal] Weekly Roundup notifications and scheduling can be turned off for WordPress as part of Jetpack focus behind a feature flag. [#19590]
+* [*] 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/Models/Notifications/NotificationSettings.swift

@@ -139,15 +139,15 @@ open class NotificationSettings {
     }
 
     // MARK: - Private Properties
-    fileprivate let blogPreferenceKeys: [String] = {
+    fileprivate var blogPreferenceKeys: [String] {
         var keys = [Keys.commentAdded, Keys.commentLiked, Keys.postLiked, Keys.follower, Keys.achievement, Keys.mention]
 
         if Feature.enabled(.weeklyRoundup) {
             keys.append(Keys.weeklyRoundup)
         }
 
         return keys
-    }()
+    }
     fileprivate let blogEmailPreferenceKeys = [Keys.commentAdded, Keys.commentLiked, Keys.postLiked, Keys.follower, Keys.mention]
     fileprivate let otherPreferenceKeys     = [Keys.commentLiked, Keys.commentReplied]
     fileprivate let wpcomPreferenceKeys     = [Keys.marketing, Keys.research, Keys.community]

WordPress/Classes/Services/NotificationFilteringService.swift

@@ -24,6 +24,10 @@ final class NotificationFilteringService {
 
         set {
             userDefaults?.set(newValue, forKey: WPNotificationsEnabledKey)
+
+            if isWordPress && !newValue {
+                cancelAllPendingWordPressLocalNotifications()
+            }
         }
     }
 
@@ -50,9 +54,21 @@ final class NotificationFilteringService {
     }
 
     func shouldFilterWordPressNotifications() -> Bool {
-        return allowDisablingWPNotifications
+        let shouldFilter = allowDisablingWPNotifications
             && isWordPress
             && !wordPressNotificationsEnabled
+
+        if shouldFilter {
+            cancelAllPendingWordPressLocalNotifications()
+        }
+
+        return shouldFilter
+    }
+
+    private func cancelAllPendingWordPressLocalNotifications(notificationCenter: UNUserNotificationCenter = UNUserNotificationCenter.current()) {
+        if isWordPress {
+            notificationCenter.removeAllPendingNotificationRequests()
+        }
     }
 }
 

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -407,6 +407,10 @@ import Foundation
     case jetpackPoweredBadgeTapped
     case jetpackPoweredBannerTapped
     case jetpackPoweredBottomSheetButtonTapped
+    case jetpackFullscreenOverlayDisplayed
+    case jetpackFullscreenOverlayLinkTapped
+    case jetpackFullscreenOverlayButtonTapped
+    case jetpackFullscreenOverlayDismissed
 
     /// A String that represents the event
     var value: String {
@@ -1102,6 +1106,14 @@ import Foundation
             return "jetpack_powered_banner_tapped"
         case .jetpackPoweredBottomSheetButtonTapped:
             return "jetpack_powered_bottom_sheet_button_tapped"
+        case .jetpackFullscreenOverlayDisplayed:
+            return "remove_feature_overlay_displayed"
+        case .jetpackFullscreenOverlayLinkTapped:
+            return "remove_feature_overlay_link_tapped"
+        case .jetpackFullscreenOverlayButtonTapped:
+            return "remove_feature_overlay_button_tapped"
+        case .jetpackFullscreenOverlayDismissed:
+            return "remove_feature_overlay_dismissed"
         } // END OF SWITCH
     }
 

WordPress/Classes/Utility/BackgroundTasks/WeeklyRoundupBackgroundTask.swift

@@ -252,6 +252,7 @@ class WeeklyRoundupBackgroundTask: BackgroundTask {
     private let eventTracker: NotificationEventTracker
     let runDateComponents: DateComponents
     let notificationScheduler: WeeklyRoundupNotificationScheduler
+    private let notificationFilteringService = NotificationFilteringService()
 
     init(
         eventTracker: NotificationEventTracker = NotificationEventTracker(),
@@ -260,7 +261,8 @@ class WeeklyRoundupBackgroundTask: BackgroundTask {
         store: Store = Store()) {
 
         self.eventTracker = eventTracker
-        notificationScheduler = WeeklyRoundupNotificationScheduler(staticNotificationDateComponents: staticNotificationDateComponents)
+        notificationScheduler = WeeklyRoundupNotificationScheduler(staticNotificationDateComponents: staticNotificationDateComponents,
+                                                                   notificationFilteringService: notificationFilteringService)
         self.store = store
 
         self.runDateComponents = runDateComponents ?? {
@@ -357,6 +359,14 @@ class WeeklyRoundupBackgroundTask: BackgroundTask {
 
     func run(onError: @escaping (Error) -> Void, completion: @escaping (Bool) -> Void) {
 
+        // This will no longer run for WordPress as part of JetPack migration.
+        // This can be removed once JetPack migration is complete.
+        if notificationFilteringService.shouldFilterWordPressNotifications() {
+            notificationScheduler.cancellAll()
+            notificationScheduler.cancelStaticNotification()
+            return
+        }
+
         // We use multiple operations in series so that if the expiration handler is
         // called, the operation queue will cancell any pending operations, ensuring
         // that the task will exit as soon as possible.
@@ -485,9 +495,11 @@ class WeeklyRoundupNotificationScheduler {
 
     init(
         staticNotificationDateComponents: DateComponents? = nil,
+        notificationFilteringService: NotificationFilteringService,
         userNotificationCenter: UNUserNotificationCenter = UNUserNotificationCenter.current()) {
 
         self.userNotificationCenter = userNotificationCenter
+        self.notificationFilteringService = notificationFilteringService
 
         self.staticNotificationDateComponents = staticNotificationDateComponents ?? {
             var dateComponents = DateComponents()
@@ -506,6 +518,7 @@ class WeeklyRoundupNotificationScheduler {
 
     let staticNotificationDateComponents: DateComponents
     let userNotificationCenter: UNUserNotificationCenter
+    let notificationFilteringService: NotificationFilteringService
 
     enum NotificationSchedulingError: Error {
         case staticNotificationSchedulingError(error: Error)
@@ -611,6 +624,10 @@ class WeeklyRoundupNotificationScheduler {
         dateComponents: DateComponents,
         completion: @escaping (Result<Void, Error>) -> Void) {
 
+        if notificationFilteringService.shouldFilterWordPressNotifications() {
+            return
+        }
+
         let content = UNMutableNotificationContent()
         content.title = title
         content.body = body
@@ -649,7 +666,7 @@ class WeeklyRoundupNotificationScheduler {
         }
     }
 
-    func cancelStaticNotification(completion: @escaping (Bool) -> Void) {
+    func cancelStaticNotification(completion: @escaping (Bool) -> Void = { _ in }) {
         userNotificationCenter.getPendingNotificationRequests { requests in
             if Feature.enabled(.weeklyRoundupStaticNotification) {
                 guard requests.contains( where: { $0.identifier == self.staticNotificationIdentifier }) else {

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -68,11 +68,11 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .milestoneNotifications:
             return true
         case .bloggingReminders:
-            return true
+            return !NotificationFilteringService().shouldFilterWordPressNotifications()
         case .siteIconCreator:
             return BuildConfiguration.current != .appStore
         case .weeklyRoundup:
-            return true
+            return !NotificationFilteringService().shouldFilterWordPressNotifications()
         case .weeklyRoundupStaticNotification:
             // This may be removed, but we're feature flagging it for now until we know for sure we won't need it.
             return false