diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java index 883943af7483..3e4095d2213a 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java @@ -24,7 +24,7 @@ public class WPGutenbergWebViewActivity extends GutenbergWebViewActivity { public static final String ARG_USER_ID = "authenticated_user_id"; public static final String ARG_BLOCK_ID = "block_id"; - public static final String ARG_BLOCK_NAME = "block_name"; + public static final String ARG_BLOCK_TITLE = "block_title"; public static final String ARG_BLOCK_CONTENT = "block_content"; private boolean mIsJetpackSsoEnabled; @@ -73,9 +73,9 @@ && getIntent().getExtras() != null) { @Override protected String getToolbarTitle() { - String blockName = getIntent().getExtras().getString(ARG_BLOCK_NAME); - if (blockName != null) { - return String.format(getString(R.string.menu_toolbar_title), blockName); + String blockTitle = getIntent().getExtras().getString(ARG_BLOCK_TITLE); + if (blockTitle != null) { + return String.format(getString(R.string.menu_toolbar_title), blockTitle); } return ""; } diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java index 88f08b68b4c9..9bbb5bcad6bb 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java @@ -304,7 +304,8 @@ public void gutenbergDidRequestUnsupportedBlockFallback(UnsupportedBlock unsuppo openGutenbergWebViewActivity( unsupportedBlock.getContent(), unsupportedBlock.getId(), - unsupportedBlock.getName() + unsupportedBlock.getName(), + unsupportedBlock.getTitle() ); } }, @@ -357,7 +358,7 @@ public void run() { return view; } - private void openGutenbergWebViewActivity(String content, String blockId, String blockName) { + private void openGutenbergWebViewActivity(String content, String blockId, String blockName, String blockTitle) { GutenbergWebViewAuthorizationData gutenbergWebViewAuthData = getArguments().getParcelable(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA); @@ -367,7 +368,7 @@ private void openGutenbergWebViewActivity(String content, String blockId, String Intent intent = new Intent(getActivity(), WPGutenbergWebViewActivity.class); intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_ID, blockId); - intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_NAME, blockName); + intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_TITLE, blockTitle); intent.putExtra(WPGutenbergWebViewActivity.ARG_BLOCK_CONTENT, content); intent.putExtra(WPGutenbergWebViewActivity.ARG_GUTENBERG_WEB_VIEW_AUTH_DATA, gutenbergWebViewAuthData); diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 57ec2f803c2e..7a701c4f4c0c 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 57ec2f803c2e98f886e560053088c829fa8cb2f5 +Subproject commit 7a701c4f4c0c62f74031b0be46f5acd8e4d61cb4