Merge 15.1-rc-2 to master

.configure

@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "master",
-  "pinned_hash": "62249ca6e914a98dcee0bb715fab1d24053ce65b",
+  "pinned_hash": "e0baad79188676d7447d5b8eca1cb27dd949bf4a",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",
@@ -27,6 +27,11 @@
       "file": "android/automattic.jks",
       "destination": "WordPress/release.jks",
       "encrypt": false
+    },
+    {
+      "file": "android/WPAndroid/google-upload-credentials.json",
+      "destination": "google-upload-credentials.json",
+      "encrypt": true
     }
   ],
   "file_dependencies": [

.gitignore

@@ -70,14 +70,15 @@ WordPress/src/main/res/values/com_crashlytics_export_strings.xml
 # Google services configuration
 google-services.json
 
-# Fastlane 
+# Fastlane
 fastlane/.env*
 fastlane/report.xml
 fastlane/README.md
 fastlane/metadata/android/screenshots.html
 fastlane/metadata/android/*/images/
 fastlane/screenshots_orig
 default.profraw
+google-upload-credentials.json
 
 # Bundler
 /.bundle

WordPress/build.gradle

@@ -55,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-229"
+            versionName "alpha-230"
         }
-        versionCode 882
+        versionCode 884
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -85,9 +85,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "15.1-rc-1"
+                versionName "15.1-rc-2"
             }
-            versionCode 881
+            versionCode 883
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,14 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_151"
+msgid ""
+"15.1:\n"
+"Block editor improvements: Scheduling, tag, and visibility settings pop up in the post editor and post list when you tap Publish — tweak them and tap “Publish Now” to complete publication. Pressing enter after adding a caption in Image, Video, Gallery, Quote, and Pullquote blocks automatically adds a new block.\n"
+"\n"
+"Fixes: Video thumbnails, settings, and preview display properly in the Media section on private sites. Notifications and Install Jetpack tabs no longer display on top of one another.\n"
+msgstr ""
+
 msgctxt "release_note_150"
 msgid ""
 "15.0:\n"
@@ -20,15 +28,15 @@ msgid ""
 "Other updates: Added homepage settings to pages list and to site settings. Improved Reader UI.\n"
 msgstr ""
 
-msgctxt "release_note_149"
+#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_short_151"
 msgid ""
-"14.9:\n"
-"<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.\n"
+"15.1:\n"
+"Improvements: Scheduling, tag, and visibility panel pops up in editor and post list pre-publication. Pressing enter after adding captions in Image, Video, Gallery, Quote, and Pullquote blocks adds a new block.\n"
 "\n"
-"<b>Block editor fixes:</b> Free Photo Library bug that inserted single images even if several were selected, preview failure when switching to the classic editor. Removed non-functional Subscription Button from Blog template.\n"
+"Fixes: Video thumbnails, settings, and preview display properly on private sites. Notifications and Install Jetpack tabs no longer overlay.\n"
 msgstr ""
 
-#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "release_note_short_150"
 msgid ""
 "15.0:\n"
@@ -37,12 +45,6 @@ msgid ""
 "Other updates: Added homepage settings to pages list and to site settings.\n"
 msgstr ""
 
-msgctxt "release_note_short_149"
-msgid ""
-"14.9:\n"
-"<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

@@ -1,4 +1,3 @@
-Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for the Floating Toolbar. Tooltip for page template selection buttons.
-Block editor updates: “Trash block” in a menu reachable from the block toolbar.
-Block editor fixes: Text block merging issue, button alignment in page templates, string inconsistencies.
-Other updates: Added homepage settings to pages list and to site settings. Improved Reader UI.
+Block editor improvements: Scheduling, tag, and visibility settings pop up in the post editor and post list when you tap Publish — tweak them and tap “Publish Now” to complete publication. Pressing enter after adding a caption in Image, Video, Gallery, Quote, and Pullquote blocks automatically adds a new block.
+
+Fixes: Video thumbnails, settings, and preview display properly in the Media section on private sites. Notifications and Install Jetpack tabs no longer display on top of one another.

WordPress/metadata/release_notes_short.txt

@@ -1,3 +1,3 @@
-Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for Floating Toolbar. Tooltip for page template selection buttons.
-Block editor updates: “Trash block” in a menu reachable from the block toolbar.
-Other updates: Added homepage settings to pages list and to site settings.
+Improvements: Scheduling, tag, and visibility panel pops up in editor and post list pre-publication. Pressing enter after adding captions in Image, Video, Gallery, Quote, and Pullquote blocks adds a new block.
+
+Fixes: Video thumbnails, settings, and preview display properly on private sites. Notifications and Install Jetpack tabs no longer overlay.

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java

@@ -1401,7 +1401,7 @@ private void showMoreMenu(View view) {
     }
 
     private void trashComment() {
-        if (!isAdded() && mComment == null) {
+        if (!isAdded() || mComment == null) {
             return;
         }
 

WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingTagsViewModel.kt

@@ -39,10 +39,11 @@ class PrepublishingTagsViewModel @Inject constructor(
     val toolbarTitleUiState: LiveData<UiString> = _toolbarTitleUiState
 
     fun start(editPostRepository: EditPostRepository) {
+        this.editPostRepository = editPostRepository
+
         if (isStarted) return
         isStarted = true
 
-        this.editPostRepository = editPostRepository
         setToolbarTitleUiState()
     }
 

build.gradle

@@ -124,7 +124,7 @@ ext {
     androidxWorkVersion = "2.0.1"
 
     daggerVersion = '2.22.1'
-    fluxCVersion = '1.6.14'
+    fluxCVersion = '1.6.14.1'
 
     appCompatVersion = '1.0.2'
     constraintLayoutVersion = '1.1.3'