diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 22dbce1115cd..a9c7dfd188f3 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,7 +2,7 @@ 17.8 ----- - +* [*] Fixed a bug where the web version of the editor did not load when using an account created before December 2018. [#14762] 17.7 ----- 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 4799f1907042..71ef5830b394 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,9 +2295,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 = mSite.isJetpackConnected() && !mIsJetpackSsoEnabled; boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite); boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic(); diff --git a/build.gradle b/build.gradle index 9b4b107f1302..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 = 'develop-a716641e22ae3b64e068bda95a517988e95669f4' + ext.gutenbergMobileVersion = 'develop-976e2830586f1679fabc297ebab5fac5b1f5fadf' repositories { maven {