Merge pull request #11901 from wordpress-mobile/merge/14.7.1-to-14.8

Merge 14.7.1 to 14.8

Author: oguzkocer

WordPress/build.gradle

@@ -87,7 +87,7 @@ android {
             if (!project.hasProperty("versionName")) {
                 versionName "14.8-rc-2"
             }
-            versionCode 861
+            versionCode 863
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
         }

WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java

@@ -176,7 +176,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (currentVersion <= DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT) {
             // versions 0 - 136 didn't support migration scripts, so we can safely drop and recreate all tables
             reset(db);
-            currentVersion = DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT;
+            currentVersion = newVersion;
         }
 
         switch (currentVersion) {