Merge pull request #1938 from vector-im/feature/fga/user_detail_direct_chat

Feature/fga/user detail direct chat

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

@@ -41,7 +41,7 @@ interface MatrixClient : Closeable {
     val roomListService: RoomListService
     val mediaLoader: MatrixMediaLoader
     suspend fun getRoom(roomId: RoomId): MatrixRoom?
-    suspend fun findDM(userId: UserId): MatrixRoom?
+    suspend fun findDM(userId: UserId): RoomId?
     suspend fun ignoreUser(userId: UserId): Result<Unit>
     suspend fun unignoreUser(userId: UserId): Result<Unit>
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 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.libraries.matrix.api.room
+
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+
+/**
+ * Try to find an existing DM with the given user, or create one if none exists.
+ */
+suspend fun MatrixClient.startDM(userId: UserId): StartDMResult {
+    val existingDM = findDM(userId)
+    return if (existingDM != null) {
+        StartDMResult.Success(existingDM, isNew = false)
+    } else {
+        createDM(userId).fold(
+            { StartDMResult.Success(it, isNew = true) },
+            { StartDMResult.Failure(it) }
+        )
+    }
+}
+
+sealed interface StartDMResult {
+    data class Success(val roomId: RoomId, val isNew: Boolean) : StartDMResult
+    data class Failure(val throwable: Throwable) : StartDMResult
+}

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

@@ -241,9 +241,8 @@ class RustMatrixClient constructor(
         }
     }
 
-    override suspend fun findDM(userId: UserId): MatrixRoom? {
-        val roomId = client.getDmRoom(userId.value)?.use { RoomId(it.id()) }
-        return roomId?.let { getRoom(it) }
+    override suspend fun findDM(userId: UserId): RoomId? {
+        return client.getDmRoom(userId.value)?.use { RoomId(it.id()) }
     }
 
     override suspend fun ignoreUser(userId: UserId): Result<Unit> = withContext(sessionDispatcher) {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -39,7 +39,6 @@ import io.element.android.libraries.matrix.test.media.FakeMediaLoader
 import io.element.android.libraries.matrix.test.notification.FakeNotificationService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.pushers.FakePushersService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
@@ -72,8 +71,7 @@ class FakeMatrixClient(
     private var unignoreUserResult: Result<Unit> = Result.success(Unit)
     private var createRoomResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
-    private var createDmFailure: Throwable? = null
-    private var findDmResult: MatrixRoom? = FakeMatrixRoom()
+    private var findDmResult: RoomId? = A_ROOM_ID
     private var logoutFailure: Throwable? = null
     private val getRoomResults = mutableMapOf<RoomId, MatrixRoom>()
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
@@ -87,7 +85,7 @@ class FakeMatrixClient(
         return getRoomResults[roomId]
     }
 
-    override suspend fun findDM(userId: UserId): MatrixRoom? {
+    override suspend fun findDM(userId: UserId): RoomId? {
         return findDmResult
     }
 
@@ -99,14 +97,11 @@ class FakeMatrixClient(
         return unignoreUserResult
     }
 
-    override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> {
-        delay(100)
+    override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> = simulateLongTask {
         return createRoomResult
     }
 
-    override suspend fun createDM(userId: UserId): Result<RoomId> {
-        delay(100)
-        createDmFailure?.let { throw it }
+    override suspend fun createDM(userId: UserId): Result<RoomId> = simulateLongTask {
         return createDmResult
     }
 
@@ -206,11 +201,7 @@ class FakeMatrixClient(
         unignoreUserResult = result
     }
 
-    fun givenCreateDmError(failure: Throwable?) {
-        createDmFailure = failure
-    }
-
-    fun givenFindDmResult(result: MatrixRoom?) {
+    fun givenFindDmResult(result: RoomId?) {
         findDmResult = result
     }
 

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -109,6 +109,7 @@
   <string name="common_dark">"Dark"</string>
   <string name="common_decryption_error">"Decryption error"</string>
   <string name="common_developer_options">"Developer options"</string>
+  <string name="common_direct_chat">"Direct chat"</string>
   <string name="common_edited_suffix">"(edited)"</string>
   <string name="common_editing">"Editing"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
@@ -227,9 +228,6 @@
     <item quantity="other">"%d votes"</item>
   </plurals>
   <string name="preference_rageshake">"Rageshake to report bug"</string>
-  <string name="screen_edit_poll_delete_confirmation">"Are you sure you want to delete this poll?"</string>
-  <string name="screen_edit_poll_delete_confirmation_title">"Delete Poll"</string>
-  <string name="screen_edit_poll_title">"Edit poll"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Failed uploading media, please try again."</string>