Integrate Gutenberg Preloading

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

@@ -22,7 +22,7 @@
 import java.io.OutputStream;
 
 public class WordPressDB {
-    private static final int DATABASE_VERSION = 70;
+    private static final int DATABASE_VERSION = 71;
 
 
     // Warning renaming DATABASE_NAME could break previous App backups (see: xml/backup_scheme.xml)
@@ -184,9 +184,12 @@
                 // so the table creation depended on that screen being opened. Now that we need this table in other
                 // places, we have to be sure the table exists even if PublicizeListActivity was never opened.
                 PublicizeTable.createTables(mDb);
             case 69:
                 // add editor theme styles site setting
                 mDb.execSQL(SiteSettingsModel.ADD_USE_THEME_STYLES);
+            case 70:
+                // add third-party blocks setting
+                mDb.execSQL(SiteSettingsModel.ADD_USE_THIRD_PARTY_BLOCKS);
         }
         mDb.setVersion(DATABASE_VERSION);
     }

WordPress/src/main/java/org/wordpress/android/datasets/SiteSettingsProvider.kt

@@ -0,0 +1,12 @@
+package org.wordpress.android.datasets
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.models.SiteSettingsModel
+
+/**
+ * Provides site-level settings for a given [SiteModel].
+ */
+interface SiteSettingsProvider {
+    fun getSettings(site: SiteModel): SiteSettingsModel?
+    fun isBlockEditorDefault(site: SiteModel): Boolean
+}

WordPress/src/main/java/org/wordpress/android/datasets/SiteSettingsProviderImpl.kt

@@ -0,0 +1,35 @@
+package org.wordpress.android.datasets
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.models.SiteSettingsModel
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SiteSettingsProviderImpl @Inject constructor() :
+    SiteSettingsProvider {
+    override fun getSettings(site: SiteModel): SiteSettingsModel? {
+        val cursor = SiteSettingsTable.getSettings(site.id.toLong())
+            ?: return null
+        return cursor.use {
+            if (it.moveToFirst()) {
+                SiteSettingsModel().also { model ->
+                    model.deserializeOptionsDatabaseCursor(it, null)
+                }
+            } else {
+                null
+            }
+        }
+    }
+
+    override fun isBlockEditorDefault(site: SiteModel): Boolean {
+        val editor = site.mobileEditor
+        if (editor.isNullOrEmpty()) return true
+        val isWpComSimple = site.isWPCom && !site.isWPComAtomic
+        return isWpComSimple || editor == GUTENBERG_EDITOR_NAME
+    }
+
+    private companion object {
+        const val GUTENBERG_EDITOR_NAME = "gutenberg"
+    }
+}

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

@@ -70,6 +70,7 @@
     private static final String JETPACK_SEARCH_SUPPORTED_COLUMN_NAME = "jetpackSearchSupported";
     private static final String JETPACK_SEARCH_ENABLED_COLUMN_NAME = "jetpackSearchEnabled";
     private static final String USE_THEME_STYLES_COLUMN_NAME = "useThemeStyles";
+    private static final String USE_THIRD_PARTY_BLOCKS_COLUMN_NAME = "useThirdPartyBlocks";
 
     public static final String SETTINGS_TABLE_NAME = "site_settings";
 
@@ -107,6 +108,9 @@
                                                + " add " + SITE_ICON_COLUMN_NAME + " INTEGER;";
     public static final String ADD_USE_THEME_STYLES = "alter table " + SETTINGS_TABLE_NAME
                                                       + " add " + USE_THEME_STYLES_COLUMN_NAME + " BOOLEAN DEFAULT 1;";
+    public static final String ADD_USE_THIRD_PARTY_BLOCKS = "alter table " + SETTINGS_TABLE_NAME
+                                                      + " add " + USE_THIRD_PARTY_BLOCKS_COLUMN_NAME
+                                                      + " BOOLEAN DEFAULT 0;";
 
     public static final String CREATE_SETTINGS_TABLE_SQL =
             "CREATE TABLE IF NOT EXISTS "
@@ -198,6 +202,7 @@
     public boolean jetpackSearchSupported;
     public boolean jetpackSearchEnabled;
     public boolean useThemeStyles = true;
+    public boolean useThirdPartyBlocks = false;
     public String quotaDiskSpace;
 
     @Override
@@ -243,6 +248,7 @@
                && jetpackSearchEnabled == otherModel.jetpackSearchEnabled
                && jetpackSearchSupported == otherModel.jetpackSearchSupported
                && useThemeStyles == otherModel.useThemeStyles
+               && useThirdPartyBlocks == otherModel.useThirdPartyBlocks
                && maxLinks == otherModel.maxLinks
                && equals(defaultPostFormat, otherModel.defaultPostFormat)
                && holdForModeration != null
@@ -309,6 +315,7 @@
         jetpackSearchSupported = other.jetpackSearchSupported;
         jetpackSearchEnabled = other.jetpackSearchEnabled;
         useThemeStyles = other.useThemeStyles;
+        useThirdPartyBlocks = other.useThirdPartyBlocks;
         if (other.holdForModeration != null) {
             holdForModeration = new ArrayList<>(other.holdForModeration);
         }
@@ -374,6 +381,7 @@
         jetpackSearchSupported = getBooleanFromCursor(cursor, JETPACK_SEARCH_SUPPORTED_COLUMN_NAME);
         jetpackSearchEnabled = getBooleanFromCursor(cursor, JETPACK_SEARCH_ENABLED_COLUMN_NAME);
         useThemeStyles = getBooleanFromCursor(cursor, USE_THEME_STYLES_COLUMN_NAME);
+        useThirdPartyBlocks = getBooleanFromCursor(cursor, USE_THIRD_PARTY_BLOCKS_COLUMN_NAME);
 
         String moderationKeys = getStringFromCursor(cursor, MODERATION_KEYS_COLUMN_NAME);
         String denylistKeys = getStringFromCursor(cursor, DENYLIST_KEYS_COLUMN_NAME);
@@ -467,6 +475,7 @@
         values.put(JETPACK_SEARCH_SUPPORTED_COLUMN_NAME, jetpackSearchSupported);
         values.put(JETPACK_SEARCH_ENABLED_COLUMN_NAME, jetpackSearchEnabled);
         values.put(USE_THEME_STYLES_COLUMN_NAME, useThemeStyles);
+        values.put(USE_THIRD_PARTY_BLOCKS_COLUMN_NAME, useThirdPartyBlocks);
 
         StringBuilder moderationKeys = new StringBuilder();
         if (holdForModeration != null) {

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

@@ -82,6 +82,7 @@
 import org.wordpress.android.ui.posts.AddCategoryFragment;
 import org.wordpress.android.ui.posts.EditPostActivity;
 import org.wordpress.android.ui.posts.GutenbergKitActivity;
+import org.wordpress.android.ui.posts.editor.GutenbergKitEditorFragment;
 import org.wordpress.android.ui.posts.EditPostPublishSettingsFragment;
 import org.wordpress.android.ui.posts.EditPostSettingsFragment;
 import org.wordpress.android.ui.posts.HistoryListFragment;
@@ -257,6 +258,8 @@ public interface AppComponent {
 
     void inject(GutenbergKitActivity object);
 
+    void inject(GutenbergKitEditorFragment object);
+
     void inject(EditPostSettingsFragment object);
 
     void inject(PostSettingsListDialogFragment object);

WordPress/src/main/java/org/wordpress/android/modules/PostModule.kt

@@ -4,6 +4,10 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.wordpress.android.datasets.SiteSettingsProvider
+import org.wordpress.android.datasets.SiteSettingsProviderImpl
+import org.wordpress.android.ui.posts.EditorServiceProvider
+import org.wordpress.android.ui.posts.EditorServiceProviderImpl
 import org.wordpress.android.ui.posts.IPostFreshnessChecker
 import org.wordpress.android.ui.posts.PostFreshnessCheckerImpl
 import javax.inject.Singleton
@@ -13,5 +17,18 @@ import javax.inject.Singleton
 class PostModule {
     @Singleton
     @Provides
-    fun providePostFreshnessChecker(): IPostFreshnessChecker = PostFreshnessCheckerImpl()
+    fun providePostFreshnessChecker(): IPostFreshnessChecker =
+        PostFreshnessCheckerImpl()
+
+    @Singleton
+    @Provides
+    fun provideSiteSettingsProvider(
+        impl: SiteSettingsProviderImpl
+    ): SiteSettingsProvider = impl
+
+    @Singleton
+    @Provides
+    fun provideEditorServiceProvider(
+        impl: EditorServiceProviderImpl
+    ): EditorServiceProvider = impl
 }