From cc649abee8a2ae68b04f2a0f719366323a1f94cf Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 9 Jul 2024 14:43:52 +0200 Subject: [PATCH 1/7] Remove Gallery Block V1, List, and Quote V2 experimental flags --- .../android/ui/posts/EditPostActivity.kt | 15 ++------------- .../ui/posts/PostEditorAnalyticsSession.java | 5 ----- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt index caf240ccdb63..a918440e3709 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt @@ -2531,17 +2531,6 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm ) } - /** - * Checks if the theme supports the new gallery block with image blocks. - * Note that if the editor theme has not been initialized (usually on the first app run) - * the value returned is null and the `unstable_gallery_with_image_blocks` analytics property will not be reported. - * @return true if the the supports the new gallery block with image blocks or null if the theme is not initialized. - */ - private fun themeSupportsGalleryWithImageBlocks(): Boolean? { - val editorTheme = editorThemeStore.getEditorThemeForSite(siteModel) ?: return null - return editorTheme.themeSupport.galleryWithImageBlocks - } - private var mediaCapturePath: String? = "" private fun getUploadErrorHtml(mediaId: String, path: String): String { return String.format( @@ -3508,7 +3497,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm if (showAztecEditor && editorFragment is AztecEditorFragment) { val entryPoint = intent.getSerializableExtra(EditPostActivityConstants.EXTRA_ENTRY_POINT) as PostUtils.EntryPoint? - postEditorAnalyticsSession?.start(null, themeSupportsGalleryWithImageBlocks(), entryPoint) + postEditorAnalyticsSession?.start(null, entryPoint) } } @@ -3523,7 +3512,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm // It assumes this is being called when the editor has finished loading // If you need to refactor this, please ensure that the startup_time_ms property // is still reflecting the actual startup time of the editor - postEditorAnalyticsSession?.start(unsupportedBlocksList, themeSupportsGalleryWithImageBlocks(), entryPoint) + postEditorAnalyticsSession?.start(unsupportedBlocksList, entryPoint) presentNewPageNoticeIfNeeded() // Start VM, load prompt and populate Editor with content after edit IS ready. diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java index 5f6c2f59eca1..a3f28808157b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java @@ -26,7 +26,6 @@ public class PostEditorAnalyticsSession implements Serializable { private static final String KEY_EDITOR = "editor"; private static final String KEY_HAS_UNSUPPORTED_BLOCKS = "has_unsupported_blocks"; private static final String KEY_UNSUPPORTED_BLOCKS = "unsupported_blocks"; - private static final String KEY_GALLERY_WITH_IMAGE_BLOCKS = "unstable_gallery_with_image_blocks"; private static final String KEY_POST_TYPE = "post_type"; private static final String KEY_OUTCOME = "outcome"; private static final String KEY_SESSION_ID = "session_id"; @@ -115,16 +114,12 @@ public static PostEditorAnalyticsSession getNewPostEditorAnalyticsSession( } public void start(ArrayList unsupportedBlocksList, - Boolean galleryWithImageBlocks, final EntryPoint entryPoint) { if (!mStarted) { mHasUnsupportedBlocks = unsupportedBlocksList != null && unsupportedBlocksList.size() > 0; Map properties = getCommonProperties(); properties.put(KEY_UNSUPPORTED_BLOCKS, unsupportedBlocksList != null ? unsupportedBlocksList : new ArrayList<>()); - if (galleryWithImageBlocks != null) { - properties.put(KEY_GALLERY_WITH_IMAGE_BLOCKS, galleryWithImageBlocks); - } // Note that start time only counts when the analytics session was created and not when the editor // activity started. We are mostly interested in measuring the loading times for the block editor, // where the main bottleneck seems to be initializing React Native and doing the initial load of Gutenberg. From 6e540dbc0dff395e5fd50e7e9e251b9c1755b5bd Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 9 Jul 2024 14:44:34 +0200 Subject: [PATCH 2/7] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f52c31d4b871..a1ab17c7afe8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' - gutenbergMobileVersion = 'v1.121.0-alpha1' + gutenbergMobileVersion = '6973-80c9f88a26f89804fbec0e929f24ac240dca38d4' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' wordPressLoginVersion = '1.16.0' From 4c4b3916e962ba9cddfb59ab9c821c409f7c0ee5 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 9 Jul 2024 15:57:07 +0200 Subject: [PATCH 3/7] Fix PostEditorAnalyticsSession Test --- .../android/ui/posts/editor/PostEditorAnalyticsSessionTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/PostEditorAnalyticsSessionTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/PostEditorAnalyticsSessionTest.kt index 614a3c708356..a1a108525f82 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/PostEditorAnalyticsSessionTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/PostEditorAnalyticsSessionTest.kt @@ -24,7 +24,7 @@ class PostEditorAnalyticsSessionTest { val postEditorAnalyticsSession = createPostEditorAnalyticsSessionTracker(analyticsTracker) // trigger all the editor_session events - postEditorAnalyticsSession.start(null, true, null) + postEditorAnalyticsSession.start(null, null) postEditorAnalyticsSession.end() postEditorAnalyticsSession.switchEditor(GUTENBERG) postEditorAnalyticsSession.applyTemplate("Just a template name") From 9924003810f034731c3a4235ecc9fa5deb28849d Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 9 Jul 2024 17:51:44 +0200 Subject: [PATCH 4/7] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a1ab17c7afe8..286e89d9aecb 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' - gutenbergMobileVersion = '6973-80c9f88a26f89804fbec0e929f24ac240dca38d4' + gutenbergMobileVersion = '6973-0239a7b2494802dfff1e9d8faa486efdf0885631' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' wordPressLoginVersion = '1.16.0' From f81da71de809606c19b1aeb49919d30762aaa3ef Mon Sep 17 00:00:00 2001 From: Gerardo Date: Thu, 11 Jul 2024 15:31:36 +0200 Subject: [PATCH 5/7] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 286e89d9aecb..a6f2ec10e0bc 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' - gutenbergMobileVersion = '6973-0239a7b2494802dfff1e9d8faa486efdf0885631' + gutenbergMobileVersion = '6978-f65a69019e6634e8277fb0861b7cd7d2f4442d73' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' wordPressLoginVersion = '1.16.0' From 5b9dbce51126b142373b1bbb21592745feea06ac Mon Sep 17 00:00:00 2001 From: Gerardo Date: Thu, 11 Jul 2024 17:28:36 +0200 Subject: [PATCH 6/7] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a6f2ec10e0bc..6fad76bd723e 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' - gutenbergMobileVersion = '6978-f65a69019e6634e8277fb0861b7cd7d2f4442d73' + gutenbergMobileVersion = '6978-25a28edbafe8bb8895436c9cc3df48c51367465d' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' wordPressLoginVersion = '1.16.0' From 6c6418e6a48654364e302040dafd3fa14618214d Mon Sep 17 00:00:00 2001 From: Gerardo Date: Fri, 12 Jul 2024 17:31:07 +0200 Subject: [PATCH 7/7] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6fad76bd723e..e96c449bcb61 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' - gutenbergMobileVersion = '6978-25a28edbafe8bb8895436c9cc3df48c51367465d' + gutenbergMobileVersion = 'v1.121.0-alpha2' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' wordPressLoginVersion = '1.16.0'