From e094304dbc58b9d57e9ab7648f557f1ed9a31084 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 4 Mar 2024 12:41:38 +0100 Subject: [PATCH 1/5] Remove remaining editor listeners related to Story block --- .../editor/gutenberg/GutenbergContainerFragment.java | 4 ---- .../editor/gutenberg/GutenbergEditorFragment.java | 9 --------- 2 files changed, 13 deletions(-) diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java index d81d0abf3f59..5d3b930e26e2 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java +++ b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java @@ -35,7 +35,6 @@ import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener; -import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnFocalPointPickerTooltipShownEventListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener; @@ -72,7 +71,6 @@ public boolean hasReceivedAnyContent() { public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener onMediaLibraryButtonListener, OnReattachMediaUploadQueryListener onReattachQueryListener, - OnReattachMediaSavingQueryListener onStorySavingReattachQueryListener, OnSetFeaturedImageListener onSetFeaturedImageListener, OnEditorMountListener onEditorMountListener, OnEditorAutosaveListener onEditorAutosaveListener, @@ -102,7 +100,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener viewGroup, onMediaLibraryButtonListener, onReattachQueryListener, - onStorySavingReattachQueryListener, onSetFeaturedImageListener, onEditorMountListener, onEditorAutosaveListener, @@ -114,7 +111,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener onGutenbergDidRequestEmbedFullscreenPreviewListener, onGutenbergDidSendButtonPressedActionListener, showSuggestionsUtil, - null, onFPPTooltipShownEventListener, onGutenbergDidRequestPreviewListener, onBlockTypeImpressionsListener, diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java index 1426d6a6f382..29199a679fb8 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java +++ b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java @@ -81,7 +81,6 @@ import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener; -import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnSetFeaturedImageListener; @@ -362,14 +361,6 @@ public void onQueryCurrentProgressForUploadingMedia() { updateMediaProgress(); } }, - new OnReattachMediaSavingQueryListener() { - @Override public void onQueryCurrentProgressForSavingMedia() { - // TODO: probably go through mFailedMediaIds, and see if any block in the post content - // has these mediaFIleIds. If there's a match, mark such a block in FAILED state. - updateFailedMediaState(); - updateMediaProgress(); - } - }, new OnSetFeaturedImageListener() { @Override public void onSetFeaturedImageButtonClicked(int mediaId) { From c461163891fe3bf06bc3e9b58139732a0768a42b Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 4 Mar 2024 12:44:59 +0100 Subject: [PATCH 2/5] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f14061c960af..ec2289e64c57 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '3.4.0' - gutenbergMobileVersion = 'v1.114.0' + gutenbergMobileVersion = '6691-627e8022b200487f590e262ebe9b28e38ef171f0' wordPressAztecVersion = 'v2.0' wordPressFluxCVersion = 'trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968' wordPressLoginVersion = '1.14.1' From 3e9a3f74050c37a8802090b595007a29341ff63e Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 4 Mar 2024 22:39:55 +0100 Subject: [PATCH 3/5] Update Gutenberg Mobile reference with alpha tag --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec2289e64c57..3eddde775ff0 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '3.4.0' - gutenbergMobileVersion = '6691-627e8022b200487f590e262ebe9b28e38ef171f0' + gutenbergMobileVersion = 'v1.115.0-alpha1' wordPressAztecVersion = 'v2.0' wordPressFluxCVersion = 'trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968' wordPressLoginVersion = '1.14.1' From 513e08c7bb486a32f232ed5872aa0fdb2efaa9a0 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 4 Mar 2024 22:41:59 +0100 Subject: [PATCH 4/5] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 9e55c789079a..28feb6cab252 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -9,6 +9,7 @@ * [*] Block editor: Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110] * [*] Block editor: Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264] * [*] Block editor: Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288] +* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] 24.3 ----- From 6d55ea10cd4ef3583cc576d69a35374f0b84b883 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 4 Mar 2024 22:46:13 +0100 Subject: [PATCH 5/5] Move release note entry to version 24.5 --- RELEASE-NOTES.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 28feb6cab252..9b5a0f2ef7b7 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +24.5 +----- +* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] + 24.4 ----- * [***] [Jetpack-only] Improved Notifications experience with richer UI elements and interactions [https://github.com/wordpress-mobile/WordPress-Android/pull/20072] @@ -9,7 +13,6 @@ * [*] Block editor: Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110] * [*] Block editor: Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264] * [*] Block editor: Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288] -* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] 24.3 -----