From a2f2cd28f9370175c2aae59d4ba5ca83cfe55c09 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 May 2023 11:56:08 +0200
Subject: [PATCH] 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<Event : Any, State : Any>(
         currentStateConfig?.onEnter?.invoke(nextState)
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun <E : Event> findMatchingRoute(event: E): StateMachineRoute<E, State, State>? {
         val routesForEvent = routes.filter { it.eventType.isInstance(event) }