Merge release 13.0 into develop

WordPress/build.gradle

@@ -49,8 +49,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-183"
-        versionCode 762
+        versionName "alpha-185"
+        versionCode 766
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -74,8 +74,8 @@ android {
     productFlavors {
         vanilla { // used for release and beta
             dimension "buildType"
-            versionName "13.0-rc-1"
-            versionCode 761
+            versionName "13.0-rc-3"
+            versionCode 765
         }
 
         zalpha { // alpha version - enable experimental features

WordPress/metadata/PlayStoreStrings.po

@@ -10,13 +10,23 @@ msgstr ""
 "X-Generator: VsCode\n"
 "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_130"
+msgid ""
+"13.0:\n"
+"* Block editor improvements: the editor is auto-enabled when you open a block post (unless you opted out in v12.9), or you can enable it on a per-site basis.\n"
+"* Accessibility improvements: screen readers can now read more of the stats screen.\n"
+"* General usability improvements: logging in is speedier, colors are more consistent across screens, and bug fixes put an end to some crashes.\n"
+msgstr ""
+
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "release_note_129"
 msgid ""
 "12.9:\n"
 "* Customers with unclaimed domain credits can register domains in the app.\n"
 "* You can expand the Comment Editor to Full Screen for more space while editing.\n"
 "* The Block editor has a few improvements: Video blocks are available, and a some issues that led to content loss when using unsupported blocks have been resolved.\n"
+"* The block editor is now the default for new posts after you open a block-based post for the first time.\n"
 msgstr ""
 
 msgctxt "release_note_128"

WordPress/metadata/release_notes.txt

@@ -1,5 +1,3 @@
-* Fixes a crash that could happen when viewing help from the login screen
-* Allow setting which editor to use on a per-site basis
-* Improves accessibility in stats
-* Makes it easier to log in by validating the URL to your site more quickly.
-* Some minor tweaks to the colour scheme
+* Block editor improvements: the editor is auto-enabled when you open a block post (unless you opted out in v12.9), or you can enable it on a per-site basis.
+* Accessibility improvements: screen readers can now read more of the stats screen.
+* General usability improvements: logging in is speedier, colors are more consistent across screens, and bug fixes put an end to some crashes.

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

@@ -880,7 +880,7 @@ public void onAppComesFromBackground() {
             sDeleteExpiredStats.runIfNotLimited();
 
             // Let's migrate the old editor preference if available in AppPrefs to the remote backend
-            SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(mContext, mDispatcher, mSiteStore);
+            SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(mContext, mDispatcher);
 
             if (mFirstActivityResumed) {
                 deferredInit();

WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java

@@ -227,7 +227,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.CREATE_SITE:
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
-                    SiteUtils.enableBlockEditor(mDispatcher, mSiteStore, newSiteLocalID);
+                    SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
                     // Mark the site to show the GB popup at first editor run
                     SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
                     if (newSiteModel != null) {

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -49,6 +49,7 @@
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask;
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload;
+import org.wordpress.android.fluxc.store.SiteStore.OnAllSitesMobileEditorChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnQuickStartCompleted;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteEditorsChanged;
@@ -775,7 +776,7 @@ public void onClick(View v) {
                 // Enable the block editor on sites created on mobile
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
-                    SiteUtils.enableBlockEditor(mDispatcher, mSiteStore, newSiteLocalID);
+                    SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
                     // Mark the site to show the GB popup at first editor run
                     SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
                     if (newSiteModel != null) {
@@ -1157,6 +1158,26 @@ public void onSiteEditorsChanged(OnSiteEditorsChanged event) {
             return;
         }
 
+       refreshCurrentSelectedSiteAfterEditorChanges(false, event.site.getId());
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onAllSitesMobileEditorChanged(OnAllSitesMobileEditorChanged event) {
+        if (event.isError()) {
+            return;
+        }
+        if (event.isNetworkResponse) {
+            // We can remove the global app setting now, since we're sure the migration ended with success.
+            AppPrefs.removeAppWideEditorPreference();
+        }
+        refreshCurrentSelectedSiteAfterEditorChanges(true, -1);
+    }
+
+    private void refreshCurrentSelectedSiteAfterEditorChanges(boolean alwaysRefreshUI, int localSiteID) {
+        // Need to update the user property about GB enabled on any of the sites
+        AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);
+
         // "Reload" selected site from the db
         // It would be better if the OnSiteChanged provided the list of changed sites.
         if (getSelectedSite() == null && mSiteStore.hasSite()) {
@@ -1166,6 +1187,15 @@ public void onSiteEditorsChanged(OnSiteEditorsChanged event) {
             return;
         }
 
+        // When alwaysRefreshUI is `true` we need to refresh the UI regardless of the current site
+        if (!alwaysRefreshUI) {
+            // we need to refresh the UI only when the site IDs matches
+            if (getSelectedSite().getId() != localSiteID) {
+                // No need to refresh the UI, since the current selected site is another site
+                return;
+            }
+        }
+
         SiteModel site = mSiteStore.getSiteByLocalId(getSelectedSite().getId());
         if (site != null) {
             mSelectedSite = site;

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -162,6 +162,7 @@
 import org.wordpress.android.util.WPPermissionUtils;
 import org.wordpress.android.util.WPUrlUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 import org.wordpress.android.util.helpers.MediaGalleryImageSpan;
@@ -1558,10 +1559,16 @@ private void showGutenbergInformativeDialog() {
     }
 
     private void setGutenbergEnabledIfNeeded() {
-        if ((TextUtils.isEmpty(mSite.getMobileEditor()) && !mIsNewPost)
-            || AppPrefs.shouldShowGutenbergInfoPopup(mSite.getUrl())) {
+        boolean showPopup = AppPrefs.shouldShowGutenbergInfoPopup(mSite.getUrl());
+
+        if (TextUtils.isEmpty(mSite.getMobileEditor()) && !mIsNewPost) {
             SiteUtils.enableBlockEditor(mDispatcher, mSite);
-            AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, mSite);
+            AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, mSite,
+                    BlockEditorEnabledSource.ON_BLOCK_POST_OPENING.asPropertyMap());
+            showPopup = true;
+        }
+
+        if (showPopup) {
             showGutenbergInformativeDialog();
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

@@ -648,6 +648,10 @@ public static boolean isGutenbergEditorEnabled() {
         return true;
     }
 
+    /**
+     * @deprecated  As of release 13.0, replaced by SiteSettings mobile editor value
+     */
+    @Deprecated
     public static boolean isGutenbergDefaultForNewPosts() {
         return getBoolean(DeletablePrefKey.GUTENBERG_DEFAULT_FOR_NEW_POSTS, false);
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java

@@ -84,6 +84,7 @@
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.WPPrefUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.widgets.WPSnackbar;
 
 import java.util.HashMap;
@@ -743,7 +744,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             }
             AnalyticsUtils.trackWithSiteDetails(
                     ((Boolean) newValue) ? Stat.EDITOR_GUTENBERG_ENABLED : Stat.EDITOR_GUTENBERG_DISABLED,
-                    mSite);
+                    mSite, BlockEditorEnabledSource.VIA_SITE_SETTINGS.asPropertyMap());
             // we need to refresh metadata as gutenberg_enabled is now part of the user data
             AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);
         } else {

WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java

@@ -19,7 +19,9 @@
 import org.wordpress.android.fluxc.generated.SiteActionBuilder;
 import org.wordpress.android.fluxc.model.PostFormatModel;
 import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.OnAllSitesMobileEditorChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnPostFormatsChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteEditorsChanged;
 import org.wordpress.android.models.CategoryModel;
@@ -31,6 +33,7 @@
 import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.StringUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -171,6 +174,7 @@ public interface SiteSettingsListener {
 
     @Inject SiteStore mSiteStore;
     @Inject Dispatcher mDispatcher;
+    @Inject AccountStore mAccountStore;
 
     protected SiteSettingsInterface(Context host, SiteModel site, SiteSettingsListener listener) {
         ((WordPress) host.getApplicationContext()).component().inject(this);
@@ -949,7 +953,11 @@ public SiteSettingsInterface init(boolean fetchRemote) {
         if (fetchRemote) {
             fetchRemoteData();
             mDispatcher.dispatch(SiteActionBuilder.newFetchPostFormatsAction(mSite));
-            mDispatcher.dispatch(SiteActionBuilder.newFetchSiteEditorsAction(mSite));
+            if (!AppPrefs.isDefaultAppWideEditorPreferenceSet()) {
+                // Check if the migration from app-wide to per-site setting has already happened - v12.9->13.0
+                // before fetching site editors from the remote
+                mDispatcher.dispatch(SiteActionBuilder.newFetchSiteEditorsAction(mSite));
+            }
         }
 
         return this;
@@ -1136,6 +1144,25 @@ public void onSiteEditorsChanged(OnSiteEditorsChanged event) {
         if (event.isError()) {
             return;
         }
+        updateAnalyticsAndUI();
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onAllSitesMobileEditorChanged(OnAllSitesMobileEditorChanged event) {
+        if (event.isError()) {
+            return;
+        }
+        if (event.isNetworkResponse) {
+            // We can remove the global app setting now, since we're sure the migration ended with success.
+            AppPrefs.removeAppWideEditorPreference();
+        }
+        updateAnalyticsAndUI();
+    }
+
+    private void updateAnalyticsAndUI() {
+        // Need to update the user property about GB enabled on any of the sites
+        AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);
 
         notifyUpdatedOnUiThread();
     }

WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java

@@ -6,13 +6,17 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.generated.SiteActionBuilder;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorForAllSitesPayload;
 import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorPayload;
 import org.wordpress.android.ui.plans.PlansConstants;
 import org.wordpress.android.ui.prefs.AppPrefs;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.util.helpers.Version;
 
 import java.util.ArrayList;
@@ -25,53 +29,35 @@ public class SiteUtils {
     /**
      * Migrate the old app-wide editor preference value to per-site setting. wpcom sites will make a network call
      * and store the value on the backend. selfHosted sites just store the value in the local DB in FluxC
-     *
+     * <p>
      * Strategy: Check if there is the old app-wide preference still available (v12.9 and before used it).
      * -- 12.9 ON -> turn all sites ON in 13.0
      * -- 12.9 OPTED OUT (were auto-opted in but turned it OFF) -> turn all sites OFF in 13.0
      *
-     * @param dispatcher FluxC dispatcher
-     * @param siteStore  SiteStore
      */
     public static void migrateAppWideMobileEditorPreferenceToRemote(final Context context,
-                                                                    final Dispatcher dispatcher,
-                                                                    final SiteStore siteStore) {
+                                                                    final Dispatcher dispatcher) {
         if (!AppPrefs.isDefaultAppWideEditorPreferenceSet()) {
             return;
         }
         final boolean oldAppWidePreferenceValue = AppPrefs.isGutenbergDefaultForNewPosts();
-        final List<SiteModel> sites = siteStore.getSites();
-        final boolean setDelay = sites.size() > 5;
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                // Be optimistic and remove the old app-wide preference before we start the calls
-                // Only do this when the network connection is available
-                if (NetworkUtils.isNetworkAvailable(context)) {
-                    AppPrefs.removeAppWideEditorPreference();
-                }
-                for (SiteModel currentSite : sites) {
-                    if (oldAppWidePreferenceValue) {
-                        enableBlockEditor(dispatcher, currentSite);
-                    } else {
-                        disableBlockEditor(dispatcher, currentSite);
-                    }
-                    if (setDelay) {
-                        try {
-                            Thread.sleep(200);
-                        } catch (InterruptedException e) {
-                            // no-op
-                        }
-                    }
-                }
-            }
-        }).start();
+
+        if (oldAppWidePreferenceValue) {
+            dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorForAllSitesAction(
+                    new DesignateMobileEditorForAllSitesPayload(SiteUtils.GB_EDITOR_NAME)));
+        } else {
+            dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorForAllSitesAction(
+                    new DesignateMobileEditorForAllSitesPayload(SiteUtils.AZTEC_EDITOR_NAME)));
+        }
     }
 
-    public static boolean enableBlockEditor(Dispatcher dispatcher, SiteStore siteStore, int siteLocalSiteID) {
+    public static boolean enableBlockEditorOnSiteCreation(Dispatcher dispatcher, SiteStore siteStore,
+                                                          int siteLocalSiteID) {
         SiteModel newSiteModel = siteStore.getSiteByLocalId(siteLocalSiteID);
         if (newSiteModel != null) {
-           enableBlockEditor(dispatcher, newSiteModel);
+            enableBlockEditor(dispatcher, newSiteModel);
+            AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, newSiteModel,
+                    BlockEditorEnabledSource.ON_SITE_CREATION.asPropertyMap());
             return true;
         }
         return false;

WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java

@@ -27,7 +27,6 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.ReaderPost;
 import org.wordpress.android.ui.posts.PostListViewLayoutType;
-import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.FluxCUtils;
 import org.wordpress.android.util.ImageUtils;
@@ -70,6 +69,18 @@ public class AnalyticsUtils {
 
     public static final String HAS_GUTENBERG_BLOCKS_KEY = "has_gutenberg_blocks";
 
+    public enum BlockEditorEnabledSource {
+        VIA_SITE_SETTINGS,
+        ON_SITE_CREATION,
+        ON_BLOCK_POST_OPENING;
+
+        public Map<String, Object> asPropertyMap() {
+            Map<String, Object> properties = new HashMap<>();
+            properties.put("source", name().toLowerCase(Locale.ROOT));
+            return properties;
+        }
+    }
+
     public static void updateAnalyticsPreference(Context ctx,
                                                  Dispatcher mDispatcher,
                                                  AccountStore mAccountStore,
@@ -105,15 +116,10 @@ public static void refreshMetadata(AccountStore accountStore, SiteStore siteStor
         metadata.setNumBlogs(siteStore.getSitesCount());
         metadata.setUsername(accountStore.getAccount().getUserName());
         metadata.setEmail(accountStore.getAccount().getEmail());
-
-        int siteLocalId = AppPrefs.getSelectedSite();
-        if (siteLocalId != -1) {
-            // Site previously selected, use it
-            SiteModel selectedSite = siteStore.getSiteByLocalId(siteLocalId);
-            // If saved site exist, then add info
-            if (selectedSite != null) {
-                metadata.setGutenbergEnabled(
-                        SiteUtils.isBlockEditorDefaultForNewPost(selectedSite));
+        for (SiteModel currentSite : siteStore.getSites()) {
+            if (SiteUtils.GB_EDITOR_NAME.equals(currentSite.getMobileEditor())) {
+                metadata.setGutenbergEnabled(true);
+                break;
             }
         }
 

build.gradle

@@ -106,5 +106,5 @@ buildScan {
 
 ext {
     daggerVersion = '2.22.1'
-    fluxCVersion = '1.2.0-beta-1'
+    fluxCVersion = '1.2.0-beta-3'
 }