Merge branch 'wordpress-mobile:trunk' into Migrate-`CollapseFullScree…

…nDialogFragment`-to-ViewBinding
wordpress-mobile · Jun 13, 2024 · 480ec92 · 480ec92
2 parents 20d74b8 + 6b164bb
commit 480ec92
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/WordPress/jetpack_metadata/PlayStoreStrings.po b/WordPress/jetpack_metadata/PlayStoreStrings.po
@@ -10,6 +10,17 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
+msgctxt "release_note_251"
+msgid ""
+"25.1:\n"
+"We have no updates in a house.\n"
+"We have no updates with a mouse.\n"
+"We have no updates here or there.\n"
+"We have no updates anywhere.\n"
+"We have no updates to report.\n"
+"If you need help, ask tech support.\n"
+msgstr ""
+
 msgctxt "release_note_250"
 msgid ""
 "25.0:\n"
@@ -18,15 +29,6 @@ msgid ""
 "We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.\n"
 msgstr ""
 
-msgctxt "release_note_249"
-msgid ""
-"24.9:\n"
-"- We reorganized the Stats screen to show data about traffic and insights.\n"
-"- We added a Subscribers tab to show data about site subscribers.\n"
-"- We removed social subscribers from the Total Followers card.\n"
-"- Site names and URLs are properly positioned for right-to-left language users.\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"

diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt
@@ -1,2 +1,6 @@
-* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]
-
+We have no updates in a house.
+We have no updates with a mouse.
+We have no updates here or there.
+We have no updates anywhere.
+We have no updates to report.
+If you need help, ask tech support.
diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
@@ -10,16 +10,21 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
-msgctxt "release_note_250"
+msgctxt "release_note_251"
 msgid ""
-"25.0:\n"
-"We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.\n"
+"25.1:\n"
+"We have no updates in a house.\n"
+"We have no updates with a mouse.\n"
+"We have no updates here or there.\n"
+"We have no updates anywhere.\n"
+"We have no updates to report.\n"
+"If you need help, ask tech support.\n"
 msgstr ""
 
-msgctxt "release_note_249"
+msgctxt "release_note_250"
 msgid ""
-"24.9:\n"
-"Site names and URLs are now properly positioned for right-to-left language users. Right on.\n"
+"25.0:\n"
+"We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,2 +1,6 @@
-* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]
-
+We have no updates in a house.
+We have no updates with a mouse.
+We have no updates here or there.
+We have no updates anywhere.
+We have no updates to report.
+If you need help, ask tech support.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt
@@ -638,7 +638,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         val hasQuickPressBlogId = extras.containsKey(EditPostActivityConstants.EXTRA_QUICKPRESS_BLOG_ID)
 
         // QuickPress might want to use a different blog than the current blog
-        return if (!isActionSendOrNewMedia && !hasQuickPressFlag && hasQuickPressBlogId) {
+        return if ((isActionSendOrNewMedia || hasQuickPressFlag) && hasQuickPressBlogId) {
             val localSiteId = intent.getIntExtra(EditPostActivityConstants.EXTRA_QUICKPRESS_BLOG_ID, -1)
             siteStore.getSiteByLocalId(localSiteId)
         } else {