diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index b1eb47f21b78..9b5a0f2ef7b7 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,7 +2,7 @@ 24.5 ----- - +* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] 24.4 ----- diff --git a/build.gradle b/build.gradle index 5c37ad7f85b7..919a0013e05b 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 = 'v1.115.0-alpha1' wordPressAztecVersion = 'v2.0' wordPressFluxCVersion = '2.70.0' wordPressLoginVersion = '1.14.1' 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) {