From d0f47458bd4333ee56ce842261b36089c8a93ba4 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 2 Jun 2021 11:58:02 +0100 Subject: [PATCH 01/14] Remove editor check from UBE The `/sites/{site_id}/gutenberg` endpoint is unreliable (see https://github.com/wordpress-mobile/gutenberg-mobile/issues/3425#issuecomment-840223555) but was being used to disable the UBE on sites where Gutenberg was unavailable. Since most users will have Gutenberg enabled in this scenario, it makes sense to remove usage of this API endpoint and just show a failure state if Gutenberg is unavailable. The failure state will show information on how to fix the error (i.e. enable Gutenberg on the site). --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 81e01e0095b2..c0ab2c4edd33 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2285,9 +2285,9 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { Bundle themeBundle = (editorTheme != null) ? editorTheme.getThemeSupport().toBundle() : null; boolean isUnsupportedBlockEditorEnabled = - mSite.isWPCom() || (mIsJetpackSsoEnabled && "gutenberg".equals(mSite.getWebEditor())); + mSite.isWPCom() || mIsJetpackSsoEnabled; - boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled && "gutenberg".equals(mSite.getWebEditor()); + boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled; boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite); boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic(); From cf8542166706e9641f26553d243976beb5572093 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 2 Jun 2021 12:12:02 +0100 Subject: [PATCH 02/14] Update reference to Mobile Gutenberg --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 955afd954c9b..dbdeffe593c4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'develop-c55652b5fabf0e4edd08b79da4b78418aa886410' + ext.gutenbergMobileVersion = '3573-41eefea4fcdf31a46436387b64790aabc0334e72' repositories { google() From 7a1e71ac6f94bf3d4f57c398415114ac08d2aa6f Mon Sep 17 00:00:00 2001 From: Siobhan Date: Mon, 21 Jun 2021 10:09:44 +0100 Subject: [PATCH 03/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 23139854fd33..33db8f80d4f8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-ee977ff2ef9ff77d08dbb953976e3760a16180e1' + ext.gutenbergMobileVersion = '3573-cee7f7300c13bf792fccdf68e34ff88a3b57c946' repositories { maven { From ad5c328617550b48533039541d8abd0f35994f95 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Mon, 21 Jun 2021 10:19:51 +0100 Subject: [PATCH 04/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33db8f80d4f8..72e6b7a25109 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-cee7f7300c13bf792fccdf68e34ff88a3b57c946' + ext.gutenbergMobileVersion = '3573-82ae7effff33b6de8078f187206300e2da874e2c' repositories { maven { From 3d0392bcef3ab02e468e1a720e58fba13529ef43 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Mon, 21 Jun 2021 10:22:25 +0100 Subject: [PATCH 05/14] Update RELEASE-NOTES.txt --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index f501d652c100..5d88f828124e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,7 +2,7 @@ 17.7 ----- - +* [*] Fixed a bug where the web version of the editor did not load when using an account created before December 2018. [#14762] 17.6 ----- From c1088eb88100fefb99a45b015aef0016e2cc85b8 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Mon, 21 Jun 2021 20:07:01 +0100 Subject: [PATCH 06/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 72e6b7a25109..3285df228aa5 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-82ae7effff33b6de8078f187206300e2da874e2c' + ext.gutenbergMobileVersion = '3573-09da2f2da4e990830f1d0d5fa87fe7d46b6e4e26' repositories { maven { From 202adc6de028cc8d8467190e39d19a8db4bc9748 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 22 Jun 2021 16:08:16 +0100 Subject: [PATCH 07/14] Bump reference to Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3285df228aa5..c70c329a925c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-09da2f2da4e990830f1d0d5fa87fe7d46b6e4e26' + ext.gutenbergMobileVersion = '3573-ee1f5d25656a89e0699697e2cf8d0ee089eaf94e' repositories { maven { From e9585584443f17793f7f725036f398dae0ae5ef1 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 22 Jun 2021 16:14:59 +0100 Subject: [PATCH 08/14] Bump Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c70c329a925c..0557f8ddf670 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-ee1f5d25656a89e0699697e2cf8d0ee089eaf94e' + ext.gutenbergMobileVersion = '3573-1ed035fe96b0d0de73702fbbdfb79fa922dd6222' repositories { maven { From 80e1fa9e2b02f363ca148cb764d514434635a617 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 22 Jun 2021 20:04:35 +0100 Subject: [PATCH 09/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0557f8ddf670..b034f2025a86 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-1ed035fe96b0d0de73702fbbdfb79fa922dd6222' + ext.gutenbergMobileVersion = '3573-45fd6b627caecc537dc5b1d308ca1a2bcdb2af1f' repositories { maven { From f3e005d8397a07bced6ad90950671dced52e68f7 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 23 Jun 2021 11:42:24 +0100 Subject: [PATCH 10/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0557f8ddf670..aabb3f2fcef3 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-1ed035fe96b0d0de73702fbbdfb79fa922dd6222' + ext.gutenbergMobileVersion = '3573-048e597d214e0943d90066d692e82ebd59141d3b' repositories { maven { From 69b2bcc855111a896f066a98b5dff78bf7bd76c7 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 25 Jun 2021 11:44:20 +0100 Subject: [PATCH 11/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 568cd7d639f5..ddac7eb9dcde 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-cf03c79357805169b5127334e789149435b4ec3e' + ext.gutenbergMobileVersion = '3573-8833a621c9558abccba05cbde8ddca4fad160499' repositories { maven { From bef9cf89aa6b299f1aef4684b962a9722516292b Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 29 Jun 2021 17:07:06 +0100 Subject: [PATCH 12/14] Add Jetpack check to unsupportedBlockEditorSwitch If the 'unsupportedBlockEditorSwitch' boolean evaluates to 'true', it will display an option to sign in via SSO when attempting to access the UBE. As the boolean was only checking for whether SSO is already enabled, it was evaluating to 'true' for self-hosted sites that didn't have Jetpack. This caused the issue outlined here: https://github.com/WordPress/gutenberg/pull/32395#pullrequestreview-694360310 With this commit, an extra check is added to ensure this boolean only evaluates to 'true' when a site is actually a Jetpack site. --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1047f6fe0676..d31ec28b4221 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2295,7 +2295,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { boolean isUnsupportedBlockEditorEnabled = mSite.isWPCom() || mIsJetpackSsoEnabled; - boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled; + boolean unsupportedBlockEditorSwitch = mSite.isJetpackConnected() && !mIsJetpackSsoEnabled; boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite); boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic(); From d55c0e85c8a78a9f4e4d804f16e857e3ae41b69b Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 29 Jun 2021 19:58:39 +0100 Subject: [PATCH 13/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bf0bfeadd42a..daa9980bca60 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-b93b1f615d6626810486bd650a9883ba1a8a0b85' + ext.gutenbergMobileVersion = '3573-45c71b160085f207f3a39d222da4d2e965f36887' repositories { maven { From a19490c0a9aea4ab87b7b330eb80c110adbbb715 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 29 Jun 2021 22:33:51 +0100 Subject: [PATCH 14/14] Bump Gutenberg Mobile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index daa9980bca60..44a9c171a774 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3573-45c71b160085f207f3a39d222da4d2e965f36887' + ext.gutenbergMobileVersion = 'develop-976e2830586f1679fabc297ebab5fac5b1f5fadf' repositories { maven {