Merge changes from beta 19.5.0.1 and editorialized release notes

WordPress/Classes/Services/ReaderPostService.m

@@ -158,7 +158,6 @@ - (void)fetchPost:(NSUInteger)postID forSite:(NSUInteger)siteID isFeed:(BOOL)isF
 
     } failure:^(NSError *error) {
         if (failure) {
-            DDLogError(@"Error fetching post with id %@ and site %@. %@", postID, siteID, error);
             failure(error);
         }
     }];
@@ -188,7 +187,6 @@ - (void)fetchPostAtURL:(NSURL *)postURL
 
     } failure:^(NSError *error) {
         if (failure) {
-            DDLogError(@"Error fetching post with url %@. %@", postURL, error);
             failure(error);
         }
     }];
@@ -215,7 +213,7 @@ - (ReaderPost *)findPostWithID:(NSNumber *)postID forSite:(NSNumber *)siteID
     fetchRequest.predicate = [NSPredicate predicateWithFormat:@"postID = %@ AND siteID = %@", postID, siteID];
     NSArray *results = [self.managedObjectContext executeFetchRequest:fetchRequest error:&error];
     if (error) {
-        DDLogError(@"Error loading cached post with id %@ and site %@. %@", postID, siteID, error);
+        DDLogError(@"Error loading cached post for site: %@", error);
         return nil;
     }
 

WordPress/Classes/Utility/BackgroundTasks/BackgroundTasksCoordinator.swift

@@ -78,6 +78,20 @@ class BackgroundTasksCoordinator {
         self.registeredTasks = tasks
 
         for task in tasks {
+            if FeatureFlag.weeklyRoundupBGProcessingTask.enabled {
+                // https://github.com/wordpress-mobile/WordPress-iOS/issues/18156
+                // we still need to register to handle the old identifier = "org.wordpress.bgtask.weeklyroundup"
+                // in order to handle previously scheduled app refresh tasks before this enhancement.
+                //
+                // When the old identifier AppRefreshTask is triggered this will re-schedule using the new identifier going forward
+                // at some point in future when this FeatureFlag is removed and most users are on new version of app this can be removed
+                scheduler.register(forTaskWithIdentifier: WeeklyRoundupBackgroundTask.Constants.taskIdentifier, using: nil) { osTask in
+                    self.schedule(task) { [weak self] result in
+                        self?.taskScheduledCompleted(osTask, identifier: type(of: task).identifier, result: result, cancelled: false)
+                    }
+                }
+            }
+
             scheduler.register(forTaskWithIdentifier: type(of: task).identifier, using: nil) { osTask in
                 guard Feature.enabled(.weeklyRoundup) else {
                     osTask.setTaskCompleted(success: false)
@@ -97,21 +111,39 @@ class BackgroundTasksCoordinator {
                 }) { cancelled in
                     eventHandler.handle(.taskCompleted(identifier: type(of: task).identifier, cancelled: cancelled))
 
-                    self.schedule(task) { result in
-                        switch result {
-                        case .success:
-                            eventHandler.handle(.rescheduled(identifier: type(of: task).identifier))
-                        case .failure(let error):
-                            eventHandler.handle(.error(identifier: type(of: task).identifier, error: error))
+                    if FeatureFlag.weeklyRoundupBGProcessingTask.enabled {
+                        self.schedule(task) { [weak self] result in
+                            self?.taskScheduledCompleted(osTask, identifier: type(of: task).identifier, result: result, cancelled: cancelled)
+                        }
+                    } else {
+                        //TODO - remove after removing feature flag
+                        self.schedule(task) { result in
+                            switch result {
+                            case .success:
+                                eventHandler.handle(.rescheduled(identifier: type(of: task).identifier))
+                            case .failure(let error):
+                                eventHandler.handle(.error(identifier: type(of: task).identifier, error: error))
+                            }
+
+                            osTask.setTaskCompleted(success: !cancelled)
                         }
-
-                        osTask.setTaskCompleted(success: !cancelled)
                     }
                 }
             }
         }
     }
 
+    func taskScheduledCompleted(_ osTask: BGTask, identifier: String, result: Result<Void, Error>, cancelled: Bool) {
+        switch result {
+        case .success:
+            eventHandler.handle(.rescheduled(identifier: identifier))
+        case .failure(let error):
+            eventHandler.handle(.error(identifier: identifier, error: error))
+        }
+
+        osTask.setTaskCompleted(success: !cancelled)
+    }
+
     /// Schedules the registered tasks.  The reason this step is separated from the registration of the tasks, is that we need
     /// to make sure the task registration completes before the App finishes launching, while scheduling can be taken care
     /// of separately.

WordPress/Jetpack/Resources/AppStoreStrings.po

@@ -38,17 +38,20 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v19.4-whats-new"
+msgctxt "v19.5-whats-new"
 msgid ""
-"Color us excited—support for multiple color palettes is here! Add Theme and Default color and gradient palettes, or create your own Custom palette with your favorite shades. We also fixed an issue that caused theme colors not to appear and current theme data not to refresh.\n"
+"We updated Comment Notifications with a spiffy new look and feel. (You might recognize it from My Site Comments!) The Quick Start design in your site menu and dashboard is rocking a new look, too.\n"
 "\n"
-"For devices using right-to-left languages, we updated icon, button, and text positioning for the “Choose a Domain” screen in the site creation process. Alright, alright.\n"
+"When you’re creating a new site and entering the domain name, you should now see a more accurate error message if you try to use non-English characters that aren’t letters or numbers. We also tweaked the upload error text in media upload blocks.\n"
 "\n"
-"Want to see rich media like images and .gifs in your device’s push notifications? Just press and hold the notification to open a preview.\n"
+"Not sure if you’re looking at an image or a GIF in your Image block? No need to wonder anymore—animated GIFs now come with a GIF badge.\n"
 "\n"
-"We made some tweaks to Weekly Roundup notifications to make sure they’re showing up once you’ve enabled them. Giddyup!\n"
+"We also made a few bug fixes while we were under the hood.\n"
 "\n"
-"Finally, we added a few fixes on the Insight screen that’ll help speed things up. We also squashed a bug that bolded auto-corrected words in content block headings.\n"
+"- Good news for all those orphan comments out there—we squashed a bug where comment replies got lost after their parent comments were unapproved.\n"
+"- When you switch between sites on an iPad, you won’t switch between sidebar nav items, too. You’ll be looking at the same menu item you left on the previous site.\n"
+"- Block setting changes to ordered lists now appear in the editor, not just in Preview.\n"
+"- We fixed a keyboard issue in the WP.com account creation process. If you start entering a magic link password and change your mind, you can dismiss the keyboard and move on with your day.\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,10 +1,12 @@
-* [*] Improves the error message shown when trying to create a new site with non-English characters in the domain name [https://github.com/wordpress-mobile/WordPress-iOS/pull/17985]
-* [*] Quick Start: updated the design for the Quick Start cell on My Site [#18095]
-* [*] Reader: Fixed a bug where comment replies are misplaced after its parent comment is moderated [#18094]
-* [*] Bug fix: Allow keyboard to be dismissed when the password field is focused during WP.com account creation [https://github.com/wordpress-mobile/WordPress-iOS/pull/17938]
-* [*] iPad: Fixed a bug where the current displayed section wasn't selected on the menu [#18118]
-* [**] Comment Notifications: updated UI and functionality to match My Site Comments. [#18141]
-* [*] Block Editor: Add GIF badge for animated GIFs uploaded to Image blocks [https://github.com/WordPress/gutenberg/pull/38996]
-* [*] Block Editor: Small refinement to media upload errors, including centering and tweaking copy. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4597]
-* [*] Block Editor: Fix issue with list's starting index and the order [https://github.com/WordPress/gutenberg/pull/39354]
+We updated Comment Notifications with a spiffy new look and feel. (You might recognize it from My Site Comments!) The Quick Start design in your site menu and dashboard is rocking a new look, too.
 
+When you’re creating a new site and entering the domain name, you should now see a more accurate error message if you try to use non-English characters that aren’t letters or numbers. We also tweaked the upload error text in media upload blocks.
+
+Not sure if you’re looking at an image or a GIF in your Image block? No need to wonder anymore—animated GIFs now come with a GIF badge.
+
+We also made a few bug fixes while we were under the hood.
+
+- Good news for all those orphan comments out there—we squashed a bug where comment replies got lost after their parent comments were unapproved.
+- When you switch between sites on an iPad, you won’t switch between sidebar nav items, too. You’ll be looking at the same menu item you left on the previous site.
+- Block setting changes to ordered lists now appear in the editor, not just in Preview.
+- We fixed a keyboard issue in the WP.com account creation process. If you start entering a magic link password and change your mind, you can dismiss the keyboard and move on with your day.

WordPress/Resources/AppStoreStrings.po

@@ -45,17 +45,20 @@ msgctxt "app_store_keywords"
 msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
 msgstr ""
 
-msgctxt "v19.4-whats-new"
+msgctxt "v19.5-whats-new"
 msgid ""
-"Color us excited—support for multiple color palettes is here! Add Theme and Default color and gradient palettes, or create your own Custom palette with your favorite shades. We also fixed an issue that caused theme colors not to appear and current theme data not to refresh.\n"
+"We updated Comment Notifications with a spiffy new look and feel. (You might recognize it from My Site Comments!) The Quick Start design in your site menu and dashboard is rocking a new look, too.\n"
 "\n"
-"For devices using right-to-left languages, we updated icon, button, and text positioning for the “Choose a Domain” screen in the site creation process. Alright, alright.\n"
+"When you’re creating a new site and entering the domain name, you should now see a more accurate error message if you try to use non-English characters that aren’t letters or numbers. We also tweaked the upload error text in media upload blocks.\n"
 "\n"
-"Want to see rich media like images and .gifs in your device’s push notifications? Just press and hold the notification to open a preview.\n"
+"Not sure if you’re looking at an image or a GIF in your Image block? No need to wonder anymore—animated GIFs now come with a GIF badge.\n"
 "\n"
-"We made some tweaks to Weekly Roundup notifications to make sure they’re showing up once you’ve enabled them. Giddyup!\n"
+"We also made a few bug fixes while we were under the hood.\n"
 "\n"
-"Finally, we added a few fixes on the Insight screen that’ll help speed things up. We also squashed a bug that bolded auto-corrected words in content block headings.\n"
+"- Good news for all those orphan comments out there—we squashed a bug where comment replies got lost after their parent comments were unapproved.\n"
+"- When you switch between sites on an iPad, you won’t switch between sidebar nav items, too. You’ll be looking at the same menu item you left on the previous site.\n"
+"- Block setting changes to ordered lists now appear in the editor, not just in Preview.\n"
+"- We fixed a keyboard issue in the WP.com account creation process. If you start entering a magic link password and change your mind, you can dismiss the keyboard and move on with your day.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.

WordPress/Resources/ar.lproj/InfoPlist.strings

@@ -1,5 +1,6 @@
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSCameraUsageDescription = "لالتقاط صور أو مقاطع الفيديو لاستخدامها في مقالاتك.";
-NSPhotoLibraryUsageDescription = "لإضافة صور أو مقاطع فيديو إلى مقالاتك.";
-NSMicrophoneUsageDescription = "بالنسبة إلى مقاطع الفيديو المراد إضافة صوت إليها.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>

WordPress/Resources/bg.lproj/InfoPlist.strings

@@ -1,14 +1,6 @@
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* Sentence to justify why the app is asking permission from the user to use their camera. */
-NSCameraUsageDescription = "To take photos or videos to use in your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access their Media Library. */
-NSPhotoLibraryUsageDescription = "To add photos or videos to your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access the device microphone. */
-NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>

WordPress/Resources/cs.lproj/InfoPlist.strings

@@ -1,14 +1,6 @@
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* Sentence to justify why the app is asking permission from the user to use their camera. */
-NSCameraUsageDescription = "To take photos or videos to use in your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access their Media Library. */
-NSPhotoLibraryUsageDescription = "To add photos or videos to your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access the device microphone. */
-NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>

WordPress/Resources/cy.lproj/InfoPlist.strings

@@ -1,5 +1,6 @@
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSCameraUsageDescription = "To take photos or videos to use in your posts.";
-NSPhotoLibraryUsageDescription = "To add photos or videos to your posts.";
-NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>

WordPress/Resources/da.lproj/InfoPlist.strings

@@ -1,5 +1,6 @@
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-NSCameraUsageDescription = "To take photos or videos to use in your posts.";
-NSPhotoLibraryUsageDescription = "To add photos or videos to your posts.";
-NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>

WordPress/Resources/de.lproj/InfoPlist.strings

@@ -1,5 +1,17 @@
-NSLocationUsageDescription = "WordPress möchte auf Webseiten, bei denen Du das Geotagging aktiviert hast, deinen Standort zu den Beiträgen hinzufügen.";
-NSLocationWhenInUseUsageDescription = "WordPress möchte auf Webseiten, bei denen Du das Geotagging aktiviert hast, deinen Standort zu den Beiträgen hinzufügen.";
-NSCameraUsageDescription = "Um Fotos oder Videos für deine Beiträge aufzunehmen.";
-NSPhotoLibraryUsageDescription = "Um deinen Beiträgen Fotos oder Videos hinzuzufügen.";
-NSMicrophoneUsageDescription = "Damit du Sound für deine Videos aufnehmen kannst.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>NSCameraUsageDescription</key>
+    <string>Um Fotos oder Videos für deine Beiträge aufzunehmen.</string>
+    <key>NSLocationUsageDescription</key>
+    <string>Darf WordPress zu Beiträgen auf Websites, auf denen du Geotagging aktiviert hast, deinen Standort hinzufügen?</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>Darf WordPress zu Beiträgen auf Websites, auf denen du Geotagging aktiviert hast, deinen Standort hinzufügen?</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Aktiviere den Mikrofonzugriff, um in deinen Videos Ton aufzeichnen zu können.</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>Um deinen Beiträgen Fotos oder Videos hinzuzufügen.</string>
+  </dict>
+</plist>

WordPress/Resources/en-AU.lproj/InfoPlist.strings

@@ -1,14 +1,6 @@
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* This sentence is shown when the app asks permission from the user to use their location. */
-NSLocationWhenInUseUsageDescription = "WordPress would like to add your location to posts on sites where you have enabled geotagging.";
-
-/* Sentence to justify why the app is asking permission from the user to use their camera. */
-NSCameraUsageDescription = "To take photos or videos to use in your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access their Media Library. */
-NSPhotoLibraryUsageDescription = "To add photos or videos to your posts.";
-
-/* Sentence to justify why the app asks permission from the user to access the device microphone. */
-NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!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/>
+</plist>