added dedicated editPageForResultOnGutenberg launcher method for Page…

…s editing, as it's only used in one place where we already know we have Gutenberg content, so let's just launch Gutenberg there.
wordpress-mobile · Dec 27, 2018 · 2f8ef0e · 2f8ef0e
1 parent 2ccd179
commit 2f8ef0e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -618,6 +618,13 @@ public static void editPageForResult(@NonNull Fragment fragment, @NonNull PageMo
         fragment.startActivityForResult(intent, RequestCodes.EDIT_POST);
     }
 
+    public static void editPageForResultOnGutenberg(@NonNull Fragment fragment, @NonNull PageModel page) {
+        Intent intent = new Intent(fragment.getContext(), GutenbergEditPostActivity.class);
+        intent.putExtra(WordPress.SITE, page.getSite());
+        intent.putExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, page.getPageId());
+        fragment.startActivityForResult(intent, RequestCodes.EDIT_POST);
+    }
+
     public static void addNewPageForResult(@NonNull Fragment fragment, @NonNull SiteModel site) {
         Intent intent = EditPostBaseActivity.getNormalOrGutenbergEditPostActivityIntent(fragment.getContext(), true, null);
         intent.putExtra(WordPress.SITE, site);

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
@@ -247,12 +247,16 @@ class PagesFragment : Fragment(), GutenbergWarningDialogClickInterface {
             page?.let {
                 val post = postStore.getPostByLocalPostId(page.pageId)
                 val isGutenbergContent = PostUtils.contentContainsGutenbergBlocks(post?.content)
-                if (isGutenbergContent && !AppPrefs.isGutenbergWarningDialogDisabled()) {
-                    PostUtils.showGutenbergCompatibilityWarningDialog(
-                            getActivity(), fragmentManager, post, viewModel.site
-                    )
+                if ( isGutenbergContent && AppPrefs.isGutenbergEditorEnabled()) {
+                    ActivityLauncher.editPageForResultOnGutenberg(this, page);
                 } else {
-                    ActivityLauncher.editPageForResult(this, page)
+                    if (isGutenbergContent && !AppPrefs.isGutenbergWarningDialogDisabled()) {
+                        PostUtils.showGutenbergCompatibilityWarningDialog(
+                                getActivity(), fragmentManager, post, viewModel.site
+                        )
+                    } else {
+                        ActivityLauncher.editPageForResult(this, page)
+                    }
                 }
             }
         })