From f171dc94da46226aa9e44ab39adb3273b8f66c4e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 19 Feb 2024 21:35:31 +0100
Subject: [PATCH] rust sdk : fix api changes

---
 .../libraries/eventformatter/impl/StateContentFormatter.kt      | 2 +-
 .../libraries/matrix/api/timeline/item/event/OtherState.kt      | 2 +-
 .../matrix/impl/auth/RustMatrixAuthenticationService.kt         | 1 +
 .../impl/timeline/item/event/TimelineEventContentMapper.kt      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
index 678e0f1d53..857bc0b89e 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
@@ -170,7 +170,7 @@ class StateContentFormatter @Inject constructor(
                     "RoomPinnedEvents"
                 }
             }
-            OtherState.RoomPowerLevels -> when (renderingMode) {
+            is OtherState.RoomPowerLevels -> when (renderingMode) {
                 RenderingMode.RoomList -> {
                     Timber.v("Filtering timeline item for room state change: $content")
                     null
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
index 6960b3565d..90b30cc1f9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
@@ -33,7 +33,7 @@ sealed interface OtherState {
     data object RoomJoinRules : OtherState
     data class RoomName(val name: String?) : OtherState
     data object RoomPinnedEvents : OtherState
-    data object RoomPowerLevels : OtherState
+    data class RoomPowerLevels(val users: Map<String, Long>) : OtherState
     data object RoomServerAcl : OtherState
     data class RoomThirdPartyInvite(val displayName: String?) : OtherState
     data object RoomTombstone : OtherState
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
index b777988783..c27ace88f6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
@@ -65,6 +65,7 @@ class RustMatrixAuthenticationService @Inject constructor(
         basePath = baseDirectory.absolutePath,
         passphrase = pendingPassphrase,
         userAgent = userAgentProvider.provide(),
+        additionalRootCertificates = emptyList(),
         oidcConfiguration = oidcConfiguration,
         customSlidingSyncProxy = null,
         sessionDelegate = null,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
index 67afb3907c..0bef1744cc 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
@@ -163,7 +163,7 @@ private fun RustOtherState.map(): OtherState {
         RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules
         is RustOtherState.RoomName -> OtherState.RoomName(name)
         RustOtherState.RoomPinnedEvents -> OtherState.RoomPinnedEvents
-        RustOtherState.RoomPowerLevels -> OtherState.RoomPowerLevels
+        is RustOtherState.RoomPowerLevels -> OtherState.RoomPowerLevels(users)
         RustOtherState.RoomServerAcl -> OtherState.RoomServerAcl
         is RustOtherState.RoomThirdPartyInvite -> OtherState.RoomThirdPartyInvite(displayName)
         RustOtherState.RoomTombstone -> OtherState.RoomTombstone