Skip to content

Commit 99dd808

Browse files
authored
fix: GutenbergKit settings default to undefined (#22206)
* fix: GutenbergKit editor settings defaults to undefined Align with GutenbergKit's iOS and JavaScript implementations that expect and undefined value rather than an empty object. * build: Update GutenbergKit version * refactor: Remove unused imports * build: Update GutenbergKit version * build: Update GutenbergKit version
1 parent ec5cfc9 commit 99dd808

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitActivity.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import com.automattic.android.tracks.crashlogging.JsExceptionCallback
4444
import com.google.android.material.appbar.AppBarLayout
4545
import com.google.android.material.dialog.MaterialAlertDialogBuilder
4646
import com.google.android.material.snackbar.Snackbar
47-
import com.google.gson.JsonObject
4847
import kotlinx.parcelize.parcelableCreator
4948
import org.greenrobot.eventbus.EventBus
5049
import org.greenrobot.eventbus.Subscribe
@@ -75,7 +74,6 @@ import org.wordpress.android.fluxc.generated.PostActionBuilder
7574
import org.wordpress.android.fluxc.generated.SiteActionBuilder
7675
import org.wordpress.android.fluxc.model.AccountModel
7776
import org.wordpress.android.fluxc.model.CauseOfOnPostChanged
78-
import org.wordpress.android.fluxc.model.EditorSettings
7977
import org.wordpress.android.fluxc.model.MediaModel
8078
import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState
8179
import org.wordpress.android.fluxc.model.PostImmutableModel
@@ -3123,8 +3121,8 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
31233121
@Suppress("unused")
31243122
@Subscribe(threadMode = ThreadMode.MAIN_ORDERED)
31253123
fun onEditorSettingsChanged(event: OnEditorSettingsChanged) {
3126-
val editorSettings = event.editorSettings ?: EditorSettings(JsonObject())
3127-
editorFragment?.startWithEditorSettings(editorSettings.toJsonString())
3124+
val editorSettingsString = event.editorSettings?.toJsonString() ?: "undefined"
3125+
editorFragment?.startWithEditorSettings(editorSettingsString)
31283126
}
31293127

31303128
// EditorDataProvider methods

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ google-play-services-auth = '20.4.1'
7373
google-services = '4.4.3'
7474
gravatar = '2.5.0'
7575
greenrobot-eventbus = '3.3.1'
76-
gutenberg-kit = 'v0.8.1-alpha.0'
76+
gutenberg-kit = 'v0.8.1-alpha.1'
7777
gutenberg-mobile = 'v1.121.0'
7878
indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
7979
jackson-databind = '2.12.7.1'

0 commit comments

Comments
 (0)