From 5cee2121ff76fa5b48e063d000f1e6fa732bedb3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 May 2023 11:11:45 +0000 Subject: [PATCH 1/3] Update dependency io.element.android:wysiwyg to v2.2.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76435c8e18..536c9f9655 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -148,7 +148,7 @@ anvil_compiler_api = { module = "com.squareup.anvil:compiler-api", version.ref = anvil_compiler_utils = { module = "com.squareup.anvil:compiler-utils", version.ref = "anvil" } # Composer -wysiwyg = "io.element.android:wysiwyg:2.1.0" +wysiwyg = "io.element.android:wysiwyg:2.2.0" # Miscellaneous # Add unused dependency to androidx.compose.compiler:compiler to let Renovate create PR to change the From 8beb7310efc4b88630ab9500c36a28cda9754bbb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 23 May 2023 11:55:23 +0200 Subject: [PATCH 2/3] Fix compilation issue with Wysiwyg 2.2.0 --- .../android/libraries/textcomposer/RichTextComposerLayout.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index 2fe81b44ac..e5ab34ebfe 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -47,7 +47,7 @@ import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLay import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuButtonBinding import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import io.element.android.wysiwyg.EditorEditText -import io.element.android.wysiwyg.inputhandlers.models.InlineFormat +import io.element.android.wysiwyg.view.models.InlineFormat import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction import io.element.android.libraries.resources.R as ElementR From f1bd7671123b8e16d551d99bde4304d7a248595c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 23 May 2023 11:56:08 +0200 Subject: [PATCH 3/3] Fix compilation warnings. --- .../element/android/libraries/matrix/impl/RustMatrixClient.kt | 3 +++ .../android/libraries/push/impl/push/DefaultPushHandler.kt | 3 --- .../io/element/android/libraries/statemachine/StateMachine.kt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index 57dc8c2fc9..3909aafa94 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:OptIn(ExperimentalCoroutinesApi::class) + package io.element.android.libraries.matrix.impl import io.element.android.libraries.core.coroutine.CoroutineDispatchers @@ -44,6 +46,7 @@ import io.element.android.libraries.matrix.impl.verification.RustSessionVerifica import io.element.android.libraries.sessionstorage.api.SessionStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.filter diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt index 09afe0a861..9b6be804c9 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt @@ -105,9 +105,6 @@ class DefaultPushHandler @Inject constructor( Timber.tag(loggerTag.value).d("## handleInternal()") } - pushData.roomId ?: return - pushData.eventId ?: return - val clientSecret = pushData.clientSecret val userId = if (clientSecret == null) { // Should not happen. In this case, restore default session diff --git a/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt b/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt index ccb98e0563..dd8ea7114d 100644 --- a/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt +++ b/libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt @@ -60,6 +60,7 @@ class StateMachine( currentStateConfig?.onEnter?.invoke(nextState) } + @Suppress("UNCHECKED_CAST") private fun findMatchingRoute(event: E): StateMachineRoute? { val routesForEvent = routes.filter { it.eventType.isInstance(event) }