Merge pull request #13350 from wordpress-mobile/release/16.1

Merge Release/16.1 back into develop
wordpress-mobile · Nov 10, 2020 · af5d8e9 · af5d8e9
2 parents 784bc24 + 8ded1b2
commit af5d8e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -54,9 +54,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-255"
+            versionName "alpha-256"
         }
-        versionCode 950
+        versionCode 953
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -94,9 +94,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "16.1-rc-2"
+                versionName "16.1-rc-3"
             }
-            versionCode 949
+            versionCode 952
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -3373,6 +3373,7 @@ private boolean isRemoteAutoSaveError() {
 
     @Nullable
     private PostModel handleRemoteAutoSave(boolean isError, PostModel post) {
+        mViewModel.hideSavingDialog();
         // We are in the process of remote previewing a post from the editor
         if (!isError && isUploadingPostForPreview()) {
             mViewModel.hideSavingDialog();