Merge editorialized release notes and 21.6.0.1 beta (#19991)

Author: mokagio

RELEASE-NOTES.txt

@@ -16,6 +16,10 @@
 * [*] Resolve an edge case that was causing the user to be stuck in the "Onboading Questions" screen. [#19791]
 * [*] [Jetpack-only] Tweak Migration Screens UI when fonts are enlarged. [#19944]
 
+21.5.1
+-----
+* [*] [Jetpack-only] Fixed a bug where the Login flow was restarting every time the app enters the foreground. [#19961]
+
 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]

WordPress/Classes/System/WindowManager.swift

@@ -21,6 +21,12 @@ class WindowManager: NSObject {
     ///
     private(set) var isShowingFullscreenSignIn = false
 
+    /// The root view controller for the window.
+    ///
+    var rootViewController: UIViewController? {
+        return window.rootViewController
+    }
+
     init(window: UIWindow) {
         self.window = window
     }

WordPress/Classes/ViewRelated/Stats/Insights/StatsTotalInsightsCell.swift

@@ -269,6 +269,12 @@ class StatsTotalInsightsCell: StatsBaseCell {
 
     // Rebuilds guide view for accessibility only if guide view already exists
     private func rebuildGuideViewIfNeeded() {
+        /// NSAttributedString initialized with HTML on the background  crashes the app
+        /// This method can be called when traitCollectionDidChange which can be triggered when app goes to background
+        guard UIApplication.shared.applicationState != .background else {
+            return
+        }
+
         if guideText != nil,
            let statsSummaryType = statsSummaryType,
            let guideText = StatsTotalInsightsData.makeTotalInsightsGuideText(lastPostInsight: lastPostInsight, statsSummaryType: statsSummaryType) {
@@ -379,7 +385,7 @@ class StatsTotalInsightsCell: StatsBaseCell {
         static let differenceHigher = NSLocalizedString("stats.insights.label.totalLikes.higher",
                                                         value: "*%@%@ (%@%%)* higher than the previous 7-days",
                                                         comment: "Label shown on some metrics in the Stats Insights section, such as Comments count. The placeholders will be populated with a change and a percentage – e.g. '+17 (40%) higher than the previous 7-days'. The *s mark the numerical values, which will be highlighted differently from the rest of the text.")
-        static let differenceLower = NSLocalizedString("stats.insights.label.totalLikes.higher",
+        static let differenceLower = NSLocalizedString("stats.insights.label.totalLikes.lower",
                                                        value: "*%@%@ (%@%%)* lower than the previous 7-days",
                                                        comment: "Label shown on some metrics in the Stats Insights section, such as Comments count. The placeholders will be populated with a change and a percentage – e.g. '-17 (40%) lower than the previous 7-days'. The *s mark the numerical values, which will be highlighted differently from the rest of the text.")
         static let differenceSame = NSLocalizedString("stats.insights.label.totalLikes.same",

WordPress/Jetpack/Classes/System/JetpackWindowManager.swift

@@ -197,11 +197,41 @@ private extension JetpackWindowManager {
             !hasFailedExportAttempts,
             let schemeUrl = URL(string: "\(AppScheme.wordpressMigrationV1.rawValue)\(WordPressExportRoute().path.removingPrefix("/"))")
         else {
-            showSignInUI()
+            performSafeRootNavigation { [weak self] in
+                self?.showSignInUI()
+            }
             return
         }
 
         /// WordPress is a compatible version for migrations, but needs to be loaded to prepare the data
-        showLoadWordPressUI(schemeUrl: schemeUrl)
+        performSafeRootNavigation { [weak self] in
+            self?.showLoadWordPressUI(schemeUrl: schemeUrl)
+        }
+    }
+
+    /// This method takes care of preventing screens being abruptly replaced.
+    ///
+    /// Since the import method is called whenever the app is foregrounded, we want to make sure that
+    /// any root view controller replacements only happen where it is "allowed":
+    ///
+    ///   1. When there's no root view controller yet, or
+    ///   2. When the Load WordPress screen is shown.
+    ///
+    /// Note: We should remove this method when the migration phase is concluded and we no longer need
+    /// to perfom the migration.
+    ///
+    /// - Parameter navigationClosure: The closure containing logic that eventually calls the `show` method.
+    func performSafeRootNavigation(with navigationClosure: @escaping () -> Void) {
+        switch rootViewController {
+        case .none:
+            // we can perform the navigation directly when there's no root view controller yet.
+            navigationClosure()
+        case .some(let viewController) where viewController is MigrationLoadWordPressViewController:
+            // allow the Load WordPress view to be replaced in case the migration process fails.
+            viewController.dismiss(animated: true, completion: navigationClosure)
+        default:
+            // do nothing when another root view controller is already displayed.
+            break
+        }
     }
 }

WordPress/Jetpack/Resources/AppStoreStrings.po

@@ -81,15 +81,16 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v21.5-whats-new"
+msgctxt "v21.6-whats-new"
 msgid ""
-"We’ve been hard at work on extra-technical, behind-the-scenes fixes and updates to keep the Jetpack app running smoothly.\n"
+"Find out how your content is performing with our changes to Stats Insights and learn what types of content your readers like to see.\n"
 "\n"
-"- Posticulating features\n"
-"- Rearchitecting interfaces\n"
-"- Reticulating splines\n"
-"- Codifying similitude\n"
-"- Rebuilding the gigaverse\n"
+"We also fixed a few issues in various areas of the app.\n"
+"\n"
+"- The “No media matching your search” message in the Media Picker now appears in the right spot. Home, sweet home.\n"
+"- Some users were getting stuck on the “What would you like to focus on first?” screen after logging in, but no more—focus away, friends.\n"
+"- You’ll no longer skip to the end of the migration flow if you close the app while migrating your site content from WordPress to Jetpack. We made some design adjustments to the final migration screen, too.\n"
+"- Pull-to-refresh properly updates your follower stats on the Total Followers Details screen. 10/10, would pull again.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,7 +1,8 @@
-* [*] Fix a layout issue impacting the "No media matching your search" empty state message of the Media Picker screen.  [#19820]
-* [*] The Migration flow doesn't complete automatically if the user interrupts the migration mid flow. [#19888]
-* [***] Stats Insights Update. Helps you understand how your content is performing and what’s resonating with your audience. [#19909]
-* [***] [internal] Delete all the activity logs after logging out. [#19930]
-* [*] Fixed an issue where Stats Followers details did not update on Pull-to-refresh in the Stats Followers Details screen [#19935]
-* [*] Resolve an edge case that was causing the user to be stuck in the "Onboading Questions" screen. [#19791]
-* [*] Tweak Migration Screens UI when fonts are enlarged. [#19944]
+Find out how your content is performing with our changes to Stats Insights and learn what types of content your readers like to see.
+
+We also fixed a few issues in various areas of the app.
+
+- The “No media matching your search” message in the Media Picker now appears in the right spot. Home, sweet home.
+- Some users were getting stuck on the “What would you like to focus on first?” screen after logging in, but no more—focus away, friends.
+- You’ll no longer skip to the end of the migration flow if you close the app while migrating your site content from WordPress to Jetpack. We made some design adjustments to the final migration screen, too.
+- Pull-to-refresh properly updates your follower stats on the Total Followers Details screen. 10/10, would pull again.

WordPress/JetpackDraftActionExtension/ar.lproj/InfoPlist.strings

@@ -2,10 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict>
-    <key>CFBundleDisplayName</key>
-    <string>حفظ إلى Jetpack</string>
-    <key>CFBundleName</key>
-    <string>حفظ إلى Jetpack</string>
-  </dict>
+  <dict/>
 </plist>

WordPress/JetpackDraftActionExtension/cs.lproj/InfoPlist.strings

@@ -4,8 +4,8 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleDisplayName</key>
-    <string>Uložit do Jetpacku</string>
+    <string>Uložit jako koncept</string>
     <key>CFBundleName</key>
-    <string>Uložit do Jetpacku</string>
+    <string>Uložit jako koncept</string>
   </dict>
 </plist>

WordPress/JetpackDraftActionExtension/de.lproj/InfoPlist.strings

@@ -4,8 +4,8 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleDisplayName</key>
-    <string>In Jetpack speichern</string>
+    <string>Als Entwurf speichern</string>
     <key>CFBundleName</key>
-    <string>In Jetpack speichern</string>
+    <string>Als Entwurf speichern</string>
   </dict>
 </plist>

WordPress/JetpackDraftActionExtension/en-CA.lproj/InfoPlist.strings

@@ -2,10 +2,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict>
-    <key>CFBundleDisplayName</key>
-    <string>Save to Jetpack</string>
-    <key>CFBundleName</key>
-    <string>Save to Jetpack</string>
-  </dict>
+  <dict/>
 </plist>