Skip to content
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

Fix/9748 npe in EditPostActivity onPrepareOptionsMenu #10534

Merged
merged 2 commits into from
Sep 27, 2019
Merged

Fix/9748 npe in EditPostActivity onPrepareOptionsMenu #10534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36889c7
Adding null checks in EditPostActivity onPrepareOptionsMenu
develric Sep 27, 2019
8d63ca5
Adding state checks in onOptionsItemSelected and Sentry log
develric Sep 27, 2019
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
111 changes: 78 additions & 33 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 @@ -1074,6 +1074,40 @@ private void hidePhotoPicker() {
}
}

private boolean shouldSwitchToGutenbergBeVisible(
PostModel post,
EditorFragmentAbstract editorFragment,
SiteModel site
) {
// Some guard conditions
if (post == null) {
AppLog.w(T.EDITOR, "shouldSwitchToGutenbergBeVisible got a null post parameter.");
return false;
}

if (editorFragment == null) {
AppLog.w(T.EDITOR, "shouldSwitchToGutenbergBeVisible got a null editorFragment parameter.");
return false;
}

// Check whether the content has blocks.
boolean hasBlocks = false;
boolean isEmpty = false;
try {
final String content = (String) editorFragment.getContent(post.getContent());
hasBlocks = PostUtils.contentContainsGutenbergBlocks(content);
isEmpty = TextUtils.isEmpty(content);
} catch (EditorFragmentNotAddedException e) {
// legacy exception; just ignore.
}

// if content has blocks or empty, offer the switch to Gutenberg. The block editor doesn't have good
// "Classic Block" support yet so, don't offer a switch to it if content doesn't have blocks. If the post
// is empty but the user hasn't enabled "Use Gutenberg for new posts" in Site Setting,
// don't offer the switch.
return hasBlocks || (SiteUtils.isBlockEditorDefaultForNewPost(site) && isEmpty);
}

/*
* called by PhotoPickerFragment when media is selected - may be a single item or a list of items
*/
Expand Down Expand Up @@ -1224,31 +1258,22 @@ public boolean onPrepareOptionsMenu(Menu menu) {
MenuItem switchToAztecMenuItem = menu.findItem(R.id.menu_switch_to_aztec);
MenuItem switchToGutenbergMenuItem = menu.findItem(R.id.menu_switch_to_gutenberg);

if (mShowGutenbergEditor) {
// we're showing Gutenberg so, just offer the Aztec switch
switchToAztecMenuItem.setVisible(true);
switchToGutenbergMenuItem.setVisible(false);
} else {
// we're showing Aztec so, hide the "Switch to Aztec" menu
switchToAztecMenuItem.setVisible(false);
// The following null checks should basically be redundant but were added to manage
// an odd behaviour recorded with Android 8.0.0
// (see https://github.com/wordpress-mobile/WordPress-Android/issues/9748 for more information)
if (switchToAztecMenuItem != null && switchToGutenbergMenuItem != null) {
if (mShowGutenbergEditor) {
// we're showing Gutenberg so, just offer the Aztec switch
switchToAztecMenuItem.setVisible(true);
switchToGutenbergMenuItem.setVisible(false);
} else {
// we're showing Aztec so, hide the "Switch to Aztec" menu
switchToAztecMenuItem.setVisible(false);

// Check whether the content has blocks.
boolean hasBlocks = false;
boolean isEmpty = false;
try {
final String content = (String) mEditorFragment.getContent(mPost.getContent());
hasBlocks = PostUtils.contentContainsGutenbergBlocks(content);
isEmpty = TextUtils.isEmpty(content);
} catch (EditorFragmentNotAddedException e) {
// legacy exception; just ignore.
switchToGutenbergMenuItem.setVisible(
shouldSwitchToGutenbergBeVisible(mPost, mEditorFragment, mSite)
);
}

// if content has blocks or empty, offer the switch to Gutenberg. The block editor doesn't have good
// "Classic Block" support yet so, don't offer a switch to it if content doesn't have blocks. If the post
// is empty but the user hasn't enabled "Use Gutenberg for new posts" in Site Setting,
// don't offer the switch.
switchToGutenbergMenuItem.setVisible(
hasBlocks || (SiteUtils.isBlockEditorDefaultForNewPost(mSite) && isEmpty));
}

return super.onPrepareOptionsMenu(menu);
Expand Down Expand Up @@ -1367,22 +1392,42 @@ public void onClick(View view) {
});
}
} else if (itemId == R.id.menu_switch_to_aztec) {
// let's finish this editing instance and start again, but not letting Gutenberg be used
mRestartEditorOption = RestartEditorOptions.RESTART_SUPPRESS_GUTENBERG;
mPostEditorAnalyticsSession.switchEditor(Editor.CLASSIC);
mPostEditorAnalyticsSession.setOutcome(Outcome.SAVE);
savePostAndOptionallyFinish(true);
// The following boolean check should be always redundant but was added to manage
// an odd behaviour recorded with Android 8.0.0
// (see https://github.com/wordpress-mobile/WordPress-Android/issues/9748 for more information)
if (mShowGutenbergEditor) {
// let's finish this editing instance and start again, but not letting Gutenberg be used
mRestartEditorOption = RestartEditorOptions.RESTART_SUPPRESS_GUTENBERG;
mPostEditorAnalyticsSession.switchEditor(Editor.CLASSIC);
mPostEditorAnalyticsSession.setOutcome(Outcome.SAVE);
savePostAndOptionallyFinish(true);
} else {
logWrongMenuState("Wrong state in menu_switch_to_aztec: menu should not be visible.");
}
} else if (itemId == R.id.menu_switch_to_gutenberg) {
// let's finish this editing instance and start again, but let GB be used
mRestartEditorOption = RestartEditorOptions.RESTART_DONT_SUPPRESS_GUTENBERG;
mPostEditorAnalyticsSession.switchEditor(Editor.GUTENBERG);
mPostEditorAnalyticsSession.setOutcome(Outcome.SAVE);
savePostAndOptionallyFinish(true);
// The following boolean check should be always redundant but was added to manage
// an odd behaviour recorded with Android 8.0.0
// (see https://github.com/wordpress-mobile/WordPress-Android/issues/9748 for more information)
if (shouldSwitchToGutenbergBeVisible(mPost, mEditorFragment, mSite)) {
// let's finish this editing instance and start again, but let GB be used
mRestartEditorOption = RestartEditorOptions.RESTART_DONT_SUPPRESS_GUTENBERG;
mPostEditorAnalyticsSession.switchEditor(Editor.GUTENBERG);
mPostEditorAnalyticsSession.setOutcome(Outcome.SAVE);
savePostAndOptionallyFinish(true);
} else {
logWrongMenuState("Wrong state in menu_switch_to_gutenberg: menu should not be visible.");
}
}
}
return false;
}

private void logWrongMenuState(String logMsg) {
AppLog.w(T.EDITOR, logMsg);
// Lets record this event in Sentry
CrashLoggingUtils.logException(new IllegalStateException(logMsg), T.EDITOR);
}

private void showEmptyPostErrorForSecondaryAction() {
String message = getString(mIsPage ? R.string.error_publish_empty_page : R.string.error_publish_empty_post);
if (getSecondaryAction() == SecondaryAction.SAVE_AS_DRAFT || getSecondaryAction() == SecondaryAction.SAVE) {
Expand Down