diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorConfigurationBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorConfigurationBuilder.kt index 089ce48c41e5..a455c91d4272 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorConfigurationBuilder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorConfigurationBuilder.kt @@ -2,6 +2,7 @@ package org.wordpress.android.ui.posts import org.wordpress.android.util.UrlUtils import org.wordpress.gutenberg.model.EditorConfiguration +import org.wordpress.gutenberg.model.PostTypeDetails /** * Utility object for building EditorConfiguration from settings maps. @@ -13,7 +14,8 @@ object EditorConfigurationBuilder { ): EditorConfiguration { val siteURL = settings.getSetting("siteURL") ?: "" val siteApiRoot = settings.getSetting("siteApiRoot") ?: "" - val postType = settings.getSetting("postType") ?: "post" + val postType = settings.getSetting("postType") + ?: PostTypeDetails.post val siteApiNamespace = settings.getStringArray("siteApiNamespace") return EditorConfiguration.builder( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilder.kt index c268fff930e7..d35fff16f41f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilder.kt @@ -9,6 +9,7 @@ import org.wordpress.android.fluxc.utils.extensions.getPasswordProcessed import org.wordpress.android.fluxc.utils.extensions.getUserNameProcessed import org.wordpress.android.util.AppLog import org.wordpress.android.util.UrlUtils +import org.wordpress.gutenberg.model.PostTypeDetails object GutenbergKitSettingsBuilder { private const val AUTH_BEARER_PREFIX = "Bearer " @@ -128,7 +129,11 @@ object GutenbergKitSettingsBuilder { return mutableMapOf( "postId" to postConfig.remotePostId?.toInt(), - "postType" to if (postConfig.isPage) "page" else "post", + "postType" to if (postConfig.isPage) { + PostTypeDetails.page + } else { + PostTypeDetails.post + }, "status" to postConfig.status, "postTitle" to postConfig.title, "postContent" to postConfig.content, diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilderTest.kt index 05217a8e858e..de5ab603c1e8 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilderTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilderTest.kt @@ -7,6 +7,7 @@ import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.junit.MockitoJUnitRunner import org.wordpress.android.fluxc.network.UserAgent +import org.wordpress.gutenberg.model.PostTypeDetails @RunWith(MockitoJUnitRunner::class) @Suppress("LargeClass") @@ -428,7 +429,7 @@ class GutenbergKitSettingsBuilderTest { // Verify all settings are correctly configured assertThat(settings["postId"]).isEqualTo(456) - assertThat(settings["postType"]).isEqualTo("post") + assertThat(settings["postType"]).isEqualTo(PostTypeDetails.post) assertThat(settings["postTitle"]).isEqualTo("Test Post") assertThat(settings["postContent"]).isEqualTo("Test Content") assertThat(settings["siteURL"]).isEqualTo("https://example.wordpress.com") @@ -476,7 +477,7 @@ class GutenbergKitSettingsBuilderTest { featureConfig = createFeatureConfig(isPluginsFeatureEnabled = true) ) - assertThat(settings["postType"]).isEqualTo("page") + assertThat(settings["postType"]).isEqualTo(PostTypeDetails.page) assertThat(settings["authHeader"] as String).startsWith("Basic ") assertThat(settings["siteApiRoot"]).isEqualTo("https://jetpack-site.com/wp-json/") assertThat(settings["siteApiNamespace"] as Array<*>).isEmpty() @@ -598,7 +599,7 @@ class GutenbergKitSettingsBuilderTest { assertThat(settings["postTitle"]).isNull() assertThat(settings["postContent"]).isNull() assertThat(settings["status"]).isNull() - assertThat(settings["postType"]).isEqualTo("post") // Still defaults to post + assertThat(settings["postType"]).isEqualTo(PostTypeDetails.post) // Still defaults to post } @Test diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6209f4954a96..1b7b42e87949 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -73,7 +73,7 @@ google-play-review = '2.0.2' google-services = '4.4.4' gravatar = '2.5.0' greenrobot-eventbus = '3.3.1' -gutenberg-kit = 'v0.15.1' +gutenberg-kit = 'v0.15.2' gutenberg-mobile = 'v1.121.0' indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jackson-databind = '2.12.7.1'