Skip to content

Fix Unsupported Block Editor on Accounts Created Prior to December 2018 #14762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiobhyB merged 22 commits into from
Jun 29, 2021
Merged

Fix Unsupported Block Editor on Accounts Created Prior to December 2018 #14762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d0f4745
Remove editor check from UBE
SiobhyB Jun 2, 2021
cf85421
Update reference to Mobile Gutenberg
SiobhyB Jun 2, 2021
6bfff9e
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 21, 2021
7a1e71a
Bump Gutenberg Mobile
SiobhyB Jun 21, 2021
ad5c328
Bump Gutenberg Mobile
SiobhyB Jun 21, 2021
3d0392b
Update RELEASE-NOTES.txt
SiobhyB Jun 21, 2021
c1088eb
Bump Gutenberg Mobile
SiobhyB Jun 21, 2021
3118cc3
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 22, 2021
202adc6
Bump reference to Gutenberg Mobile
SiobhyB Jun 22, 2021
e958558
Bump Gutenberg Mobile reference
SiobhyB Jun 22, 2021
80e1fa9
Bump Gutenberg Mobile
SiobhyB Jun 22, 2021
f3e005d
Bump Gutenberg Mobile
SiobhyB Jun 23, 2021
4ac6b28
Merge branch 'gb/3425-remove-ube-editor-check' of github.com:wordpres…
SiobhyB Jun 23, 2021
4bc3480
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 23, 2021
1b3c6f9
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 24, 2021
c33268c
Merge branch 'gb/3425-remove-ube-editor-check' of github.com:wordpres…
SiobhyB Jun 24, 2021
64d298d
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 25, 2021
69b2bcc
Bump Gutenberg Mobile
SiobhyB Jun 25, 2021
bef9cf8
Add Jetpack check to unsupportedBlockEditorSwitch
SiobhyB Jun 29, 2021
bb8ca33
Merge branch 'develop' into gb/3425-remove-ube-editor-check
SiobhyB Jun 29, 2021
d55c0e8
Bump Gutenberg Mobile
SiobhyB Jun 29, 2021
a19490c
Bump Gutenberg Mobile
SiobhyB Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down