Merge pull request #20659 from wordpress-mobile/release/24.7

Merge 24.7 editorialized release notes to trunk

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -10,6 +10,13 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
+msgctxt "release_note_247"
+msgid ""
+"24.7:\n"
+"We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.\n"
+"(Did we say the word “sites” enough? We think so.)\n"
+msgstr ""
+
 msgctxt "release_note_246"
 msgid ""
 "24.6:\n"
@@ -18,12 +25,6 @@ msgid ""
 "- We changed the infinity symbol to “100%” on the Stats screen. And in that moment, I swear we were 100%.\n"
 msgstr ""
 
-msgctxt "release_note_245"
-msgid ""
-"24.5:\n"
-"Good news, everyone: we fixed the broken links on your announcement badge screen. Insights into your biggest publishing accomplishments are just a tap away.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
 msgctxt "play_store_app_title"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,3 +1,2 @@
-* [**] Site picker: Added the feature to pin sites, redesigned the UI, and deprecated the Show/Hide sites functionality. [https://github.com/wordpress-mobile/WordPress-Android/pull/20521]
-* [*] [internal] Updates the way the app retrieves the User-Agent request header [https://github.com/wordpress-mobile/WordPress-Android/pull/20603]
-
+We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
+(Did we say the word “sites” enough? We think so.)

WordPress/metadata/PlayStoreStrings.po

@@ -10,19 +10,20 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
+msgctxt "release_note_247"
+msgid ""
+"24.7:\n"
+"We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.\n"
+"(Did we say the word “sites” enough? We think so.)\n"
+msgstr ""
+
 msgctxt "release_note_246"
 msgid ""
 "24.6:\n"
 "- We fixed a handful of issues with highlighted text formatting. We don’t know about you, but that’s the highlight of our week.\n"
 "- The app now supports text suggestions that are longer than the visible space in the editor. No crashes—just predictive text, as far as the eye can see.\n"
 msgstr ""
 
-msgctxt "release_note_245"
-msgid ""
-"24.5:\n"
-"The best things in life are worth the wait, like fresh-baked cookies, your coffee order, and the latest releases from your favorite app. (That’s us. See you next update.)\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"

WordPress/metadata/release_notes.txt

@@ -1,3 +1,2 @@
-* [**] Site picker: Added the feature to pin sites, redesigned the UI, and deprecated the Show/Hide sites functionality. [https://github.com/wordpress-mobile/WordPress-Android/pull/20521]
-* [*] [internal] Updates the way the app retrieves the User-Agent request header [https://github.com/wordpress-mobile/WordPress-Android/pull/20603]
-
+We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
+(Did we say the word “sites” enough? We think so.)

WordPress/src/main/java/org/wordpress/android/ui/reader/services/comment/ReaderCommentService.java

@@ -80,7 +80,13 @@ public static void startServiceForCommentSnippet(Context context, long blogId, l
         intent.putExtra(ARG_BLOG_ID, blogId);
         intent.putExtra(ARG_POST_ID, postId);
         intent.putExtra(ARG_PAGE_INFO, PageInfo.COMMENTS_SNIPPET_PAGE);
-        context.startService(intent);
+        try {
+            context.startService(intent);
+        } catch (IllegalStateException e) {
+            // This can happen if the app still appears to be running in the background
+            // see: https://github.com/wordpress-mobile/WordPress-Android/issues/18666
+            AppLog.e(AppLog.T.READER, "Unable to start ReaderCommentService: " + e.getMessage());
+        }
     }
 
     public static void stopService(Context context) {