diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 221170817c..9038c7a72a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -145,7 +145,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" } timber = "com.jakewharton.timber:timber:5.0.1" -matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.27" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.28" sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt index e6125cf69b..b62063ddc5 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt @@ -32,13 +32,13 @@ class NotificationMapper { NotificationData( senderId = UserId(it.event.senderId()), eventId = EventId(it.event.eventId()), - roomId = RoomId(it.roomId), - senderAvatarUrl = it.senderAvatarUrl, - senderDisplayName = it.senderDisplayName, - roomAvatarUrl = it.roomAvatarUrl, - roomDisplayName = it.roomDisplayName, - isDirect = it.isDirect, - isEncrypted = it.isEncrypted.orFalse(), + roomId = RoomId(it.roomInfo.id), + senderAvatarUrl = it.senderInfo.avatarUrl, + senderDisplayName = it.senderInfo.displayName, + roomAvatarUrl = it.roomInfo.avatarUrl, + roomDisplayName = it.roomInfo.displayName, + isDirect = it.roomInfo.isDirect, + isEncrypted = it.roomInfo.isEncrypted.orFalse(), isNoisy = it.isNoisy, event = it.event.use { event -> timelineEventMapper.map(event) } ) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt index 73abea0d77..4e2d63d091 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt @@ -24,7 +24,6 @@ import kotlinx.coroutines.CancellationException import kotlinx.coroutines.withTimeout import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.RoomListService -import org.matrix.rustcomponents.sdk.SlidingSync import org.matrix.rustcomponents.sdk.TimelineDiff import org.matrix.rustcomponents.sdk.TimelineListener import org.matrix.rustcomponents.sdk.genTransactionId