Adapt to changes in SDK

features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01.kt

@@ -21,6 +21,9 @@ import io.element.android.features.rageshake.api.logs.LogFilesRemover
 import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
 
+/**
+ * Remove existing logs from the device to remove any leaks of sensitive data.
+ */
 @ContributesMultibinding(AppScope::class)
 class AppMigration01 @Inject constructor(
     private val logFilesRemover: LogFilesRemover,

features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02.kt

@@ -24,6 +24,10 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 
+/**
+ * This migration sets the skip session verification preference to true for all existing sessions.
+ * This way we don't force existing users to verify their session again.
+ */
 @ContributesMultibinding(AppScope::class)
 class AppMigration02 @Inject constructor(
     private val sessionStore: SessionStore,

features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.migration.impl.migrations
+
+import com.squareup.anvil.annotations.ContributesMultibinding
+import io.element.android.libraries.di.AppScope
+import javax.inject.Inject
+
+/**
+ * This performs the same operation as [AppMigration01], since we need to clear the local logs again.
+ */
+@ContributesMultibinding(AppScope::class)
+class AppMigration03 @Inject constructor(
+    private val migration01: AppMigration01,
+) : AppMigration {
+    override val order: Int = 3
+
+    override suspend fun migrate() {
+        migration01.migrate()
+    }
+}

features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03Test.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.migration.impl.migrations
+
+import io.element.android.features.rageshake.test.logs.FakeLogFilesRemover
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class AppMigration03Test {
+    @Test
+    fun `test migration`() = runTest {
+        val logsFileRemover = FakeLogFilesRemover()
+        val migration = AppMigration03(migration01 = AppMigration01(logsFileRemover))
+
+        migration.migrate()
+
+        logsFileRemover.performLambda.assertions().isCalledOnce()
+    }
+}

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt

@@ -75,7 +75,7 @@ class RoomDetailsPresenter @Inject constructor(
 
         val roomAvatar by remember { derivedStateOf { roomInfo?.avatarUrl ?: room.avatarUrl } }
 
-        val roomName by remember { derivedStateOf { (roomInfo?.name ?: room.name ?: room.displayName).trim() } }
+        val roomName by remember { derivedStateOf { (roomInfo?.name ?: room.displayName).trim() } }
         val roomTopic by remember { derivedStateOf { roomInfo?.topic ?: room.topic } }
         val isFavorite by remember { derivedStateOf { roomInfo?.isFavorite.orFalse() } }
         val isPublic by remember { derivedStateOf { roomInfo?.isPublic.orFalse() } }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt

@@ -65,7 +65,7 @@ class RoomDetailsEditPresenter @Inject constructor(
         // just erase the local value when the room field has changed
         var roomAvatarUri by rememberSaveable(room.avatarUrl) { mutableStateOf(room.avatarUrl?.toUri()) }
 
-        var roomName by rememberSaveable { mutableStateOf((room.name ?: room.displayName).trim()) }
+        var roomName by rememberSaveable { mutableStateOf(room.displayName.trim()) }
         var roomTopic by rememberSaveable { mutableStateOf(room.topic?.trim()) }
 
         val saveButtonEnabled by remember(
@@ -76,7 +76,7 @@ class RoomDetailsEditPresenter @Inject constructor(
         ) {
             derivedStateOf {
                 roomAvatarUri?.toString()?.trim() != room.avatarUrl?.toUri()?.toString()?.trim() ||
-                    roomName.trim() != (room.name ?: room.displayName).trim() ||
+                    roomName.trim() != room.displayName.trim() ||
                     roomTopic.orEmpty().trim() != room.topic.orEmpty().trim()
             }
         }
@@ -168,7 +168,7 @@ class RoomDetailsEditPresenter @Inject constructor(
                     Timber.e(it, "Failed to set room topic")
                 })
             }
-            if (name.isNotEmpty() && name.trim() != room.name.orEmpty().trim()) {
+            if (name.isNotEmpty() && name.trim() != room.displayName.trim()) {
                 results.add(room.setName(name).onFailure {
                     Timber.e(it, "Failed to set room name")
                 })

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt

@@ -118,7 +118,7 @@ class RoomDetailsPresenterTests {
         presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.roomId).isEqualTo(room.roomId)
-            assertThat(initialState.roomName).isEqualTo(room.name)
+            assertThat(initialState.roomName).isEqualTo(room.displayName)
             assertThat(initialState.roomAvatarUrl).isEqualTo(room.avatarUrl)
             assertThat(initialState.roomTopic).isEqualTo(RoomTopicState.ExistingTopic(room.topic!!))
             assertThat(initialState.memberCount).isEqualTo(room.joinedMemberCount)
@@ -148,7 +148,7 @@ class RoomDetailsPresenterTests {
 
     @Test
     fun `present - initial state with no room name`() = runTest {
-        val room = aMatrixRoom(name = null)
+        val room = aMatrixRoom(displayName = "")
         val presenter = createRoomDetailsPresenter(room)
         presenter.test {
             val initialState = awaitItem()
@@ -476,8 +476,7 @@ class RoomDetailsPresenterTests {
 
 fun aMatrixRoom(
     roomId: RoomId = A_ROOM_ID,
-    name: String? = A_ROOM_NAME,
-    displayName: String = "A fallback display name",
+    displayName: String = A_ROOM_NAME,
     topic: String? = "A topic",
     avatarUrl: String? = "https://matrix.org/avatar.jpg",
     isEncrypted: Boolean = true,
@@ -486,7 +485,6 @@ fun aMatrixRoom(
     notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService()
 ) = FakeMatrixRoom(
     roomId = roomId,
-    name = name,
     displayName = displayName,
     topic = topic,
     avatarUrl = avatarUrl,

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt

@@ -98,7 +98,7 @@ class RoomDetailsEditPresenterTest {
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.roomId).isEqualTo(room.roomId.value)
-            assertThat(initialState.roomName).isEqualTo(room.name)
+            assertThat(initialState.roomName).isEqualTo(room.displayName)
             assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
             assertThat(initialState.roomTopic).isEqualTo(room.topic.orEmpty())
             assertThat(initialState.avatarActions).containsExactly(
@@ -191,7 +191,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates state in response to changes`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
         val presenter = createRoomDetailsEditPresenter(room)
 
         moleculeFlow(RecompositionMode.Immediate) {
@@ -234,7 +234,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - obtains avatar uris from gallery`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         fakePickerProvider.givenResult(anotherAvatarUri)
 
@@ -255,7 +255,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - obtains avatar uris from camera`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         fakePickerProvider.givenResult(anotherAvatarUri)
         val fakePermissionsPresenter = FakePermissionsPresenter()
@@ -288,7 +288,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates save button state`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         fakePickerProvider.givenResult(roomAvatarUri)
 
@@ -340,7 +340,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates save button state when initial values are null`() = runTest {
-        val room = aMatrixRoom(topic = null, name = null, displayName = "fallback", avatarUrl = null)
+        val room = aMatrixRoom(topic = null, displayName = "fallback", avatarUrl = null)
 
         fakePickerProvider.givenResult(roomAvatarUri)
 
@@ -392,7 +392,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save changes room details if different`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         val presenter = createRoomDetailsEditPresenter(room)
 
@@ -417,7 +417,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change room details if they're the same trimmed`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         val presenter = createRoomDetailsEditPresenter(room)
 
@@ -441,7 +441,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change topic if it was unset and is now blank`() = runTest {
-        val room = aMatrixRoom(topic = null, name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = null, displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         val presenter = createRoomDetailsEditPresenter(room)
 
@@ -464,7 +464,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change name if it's now empty`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         val presenter = createRoomDetailsEditPresenter(room)
 
@@ -487,7 +487,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save processes and sets avatar when processor returns successfully`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         givenPickerReturnsFile()
 
@@ -511,7 +511,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save does not set avatar data if processor fails`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL)
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL)
 
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(Result.failure(Throwable("Oh no")))
@@ -538,7 +538,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if name update fails`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL).apply {
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL).apply {
             givenSetNameResult(Result.failure(Throwable("!")))
         }
 
@@ -547,7 +547,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if topic update fails`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL).apply {
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL).apply {
             givenSetTopicResult(Result.failure(Throwable("!")))
         }
 
@@ -556,7 +556,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if removing avatar fails`() = runTest {
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL).apply {
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL).apply {
             givenRemoveAvatarResult(Result.failure(Throwable("!")))
         }
 
@@ -567,7 +567,7 @@ class RoomDetailsEditPresenterTest {
     fun `present - sets save action to failure if setting avatar fails`() = runTest {
         givenPickerReturnsFile()
 
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL).apply {
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL).apply {
             givenUpdateAvatarResult(Result.failure(Throwable("!")))
         }
 
@@ -578,7 +578,7 @@ class RoomDetailsEditPresenterTest {
     fun `present - CancelSaveChanges resets save action state`() = runTest {
         givenPickerReturnsFile()
 
-        val room = aMatrixRoom(topic = "My topic", name = "Name", avatarUrl = AN_AVATAR_URL).apply {
+        val room = aMatrixRoom(topic = "My topic", displayName = "Name", avatarUrl = AN_AVATAR_URL).apply {
             givenSetTopicResult(Result.failure(Throwable("!")))
         }
 

gradle/libs.versions.toml

@@ -159,7 +159,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:1.4.2"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.16"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.18"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt

@@ -44,7 +44,6 @@ import java.io.File
 interface MatrixRoom : Closeable {
     val sessionId: SessionId
     val roomId: RoomId
-    val name: String?
     val displayName: String
     val alias: RoomAlias?
     val alternativeAliases: List<RoomAlias>

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt

@@ -39,14 +39,12 @@ interface RoomList {
 
     /**
      * The source of the room list data.
-     * All: all rooms except invites.
-     * Invites: only invites.
+     * All: all rooms.
      *
      * To apply some dynamic filtering on top of that, use [DynamicRoomList].
      */
     enum class Source {
-        All,
-        Invites,
+        All
     }
 
     /**

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt

@@ -59,11 +59,6 @@ interface RoomListService {
      */
     val allRooms: DynamicRoomList
 
-    /**
-     * returns a [RoomList] object of all invites.
-     */
-    val invites: RoomList
-
     /**
      * Will set the visible range of all rooms.
      * This is useful to load more data when the user scrolls down.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -96,6 +96,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import org.matrix.rustcomponents.sdk.BackupState
@@ -145,12 +146,7 @@ class RustMatrixClient(
         dispatchers = dispatchers,
     )
     private val notificationProcessSetup = NotificationProcessSetup.SingleProcess(syncService)
-    private val notificationClient = client.notificationClient(notificationProcessSetup)
-        .use { builder ->
-            builder
-                .filterByPushRules()
-                .finish()
-        }
+    private val notificationClient = runBlocking { client.notificationClient(notificationProcessSetup) }
     private val notificationService = RustNotificationService(sessionId, notificationClient, dispatchers, clock)
     private val notificationSettingsService = RustNotificationSettingsService(client, dispatchers)
         .apply { start() }
@@ -465,7 +461,7 @@ class RustMatrixClient(
 
     override suspend fun resolveRoomAlias(roomAlias: RoomAlias): Result<RoomId> = withContext(sessionDispatcher) {
         runCatching {
-            client.resolveRoomAlias(roomAlias.value).let(::RoomId)
+            client.resolveRoomAlias(roomAlias.value).roomId.let(::RoomId)
         }
     }