Gutenberg/inject css on both page visible and page started and show c…

…orrect title in web view (#13122)
wordpress-mobile · Oct 14, 2020 · 44128e7 · 44128e7
1 parent df54f98
commit 44128e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...ordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java b/...ordPressEditor/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/...sEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/...sEditor/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
+3 −2		RELEASE-NOTES.txt
+1 −1		bundle/android/App.js
+1 −1		bundle/android/App.js.map
+1 −1		bundle/ios/App.js
+1 −1		bundle/ios/App.js.map
+1 −1		gutenberg