Merge branch 'develop' into feature/bma/push

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt

@@ -0,0 +1,97 @@
+/*
+ * 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.designsystem.components.dialogs
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.R as StringR
+
+@Composable
+fun RetryDialog(
+    content: String,
+    modifier: Modifier = Modifier,
+    title: String = RetryDialogDefaults.title,
+    retryText: String = RetryDialogDefaults.retryText,
+    dismissText: String = RetryDialogDefaults.dismissText,
+    onRetry: () -> Unit = {},
+    onDismiss: () -> Unit = {},
+    shape: Shape = AlertDialogDefaults.shape,
+    containerColor: Color = AlertDialogDefaults.containerColor,
+    iconContentColor: Color = AlertDialogDefaults.iconContentColor,
+    titleContentColor: Color = AlertDialogDefaults.titleContentColor,
+    textContentColor: Color = AlertDialogDefaults.textContentColor,
+    tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
+) {
+    AlertDialog(
+        modifier = modifier,
+        onDismissRequest = onDismiss,
+        title = {
+            Text(title)
+        },
+        text = {
+            Text(content)
+        },
+        confirmButton = {
+            TextButton(onClick = onRetry) {
+                Text(retryText)
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(dismissText)
+            }
+        },
+        shape = shape,
+        containerColor = containerColor,
+        iconContentColor = iconContentColor,
+        titleContentColor = titleContentColor,
+        textContentColor = textContentColor,
+        tonalElevation = tonalElevation,
+    )
+}
+
+object RetryDialogDefaults {
+    val title: String @Composable get() = stringResource(id = StringR.string.dialog_title_error)
+    val retryText: String @Composable get() = stringResource(id = StringR.string.action_retry)
+    val dismissText: String @Composable get() = stringResource(id = StringR.string.action_cancel)
+}
+
+@Preview
+@Composable
+internal fun RetryDialogLightPreview() = ElementPreviewLight { ContentToPreview() }
+
+@Preview
+@Composable
+internal fun RetryDialogDarkPreview() = ElementPreviewDark { ContentToPreview() }
+
+@Composable
+private fun ContentToPreview() {
+    RetryDialog(
+        content = "Content",
+    )
+}

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

@@ -18,6 +18,7 @@ package io.element.android.libraries.matrix.api
 
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaResolver
 import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.pusher.PushersService
@@ -31,6 +32,8 @@ interface MatrixClient : Closeable {
     val sessionId: SessionId
     val roomSummaryDataSource: RoomSummaryDataSource
     fun getRoom(roomId: RoomId): MatrixRoom?
+    suspend fun createDM(userId: UserId): Result<RoomId>
+    fun findDM(userId: UserId): MatrixRoom?
     fun startSync()
     fun stopSync()
     fun mediaResolver(): MediaResolver

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

@@ -42,7 +42,10 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientDelegate
+import org.matrix.rustcomponents.sdk.CreateRoomParameters
 import org.matrix.rustcomponents.sdk.RequiredState
+import org.matrix.rustcomponents.sdk.RoomPreset
+import org.matrix.rustcomponents.sdk.RoomVisibility
 import org.matrix.rustcomponents.sdk.SlidingSyncListBuilder
 import org.matrix.rustcomponents.sdk.SlidingSyncMode
 import org.matrix.rustcomponents.sdk.SlidingSyncRequestListFilters
@@ -167,6 +170,30 @@ class RustMatrixClient constructor(
         )
     }
 
+    override fun findDM(userId: UserId): MatrixRoom? {
+        val roomId = client.getDmRoom(userId.value)?.use { RoomId(it.id()) }
+        return roomId?.let { getRoom(it) }
+    }
+
+    override suspend fun createDM(userId: UserId): Result<RoomId> =
+        withContext(dispatchers.io) {
+            runCatching {
+                val roomId = client.createRoom(
+                    CreateRoomParameters(
+                        name = null,
+                        topic = null,
+                        isEncrypted = true,
+                        isDirect = true,
+                        visibility = RoomVisibility.PRIVATE,
+                        preset = RoomPreset.TRUSTED_PRIVATE_CHAT,
+                        invite = listOf(userId.value),
+                        avatar = null,
+                    )
+                )
+                RoomId(roomId)
+            }
+        }
+
     override fun mediaResolver(): MediaResolver = mediaResolver
 
     override fun sessionVerificationService(): SessionVerificationService = verificationService

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

@@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.test
 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.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaResolver
 import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.pusher.PushersService
@@ -44,12 +45,25 @@ class FakeMatrixClient(
     private val notificationService: FakeNotificationService = FakeNotificationService(),
 ) : MatrixClient {
 
+    private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
+    private var createDmFailure: Throwable? = null
+    private var findDmResult: MatrixRoom? = FakeMatrixRoom()
     private var logoutFailure: Throwable? = null
 
     override fun getRoom(roomId: RoomId): MatrixRoom? {
         return FakeMatrixRoom(roomId)
     }
 
+    override suspend fun createDM(userId: UserId): Result<RoomId> {
+        delay(100)
+        createDmFailure?.let { throw it }
+        return createDmResult
+    }
+
+    override fun findDM(userId: UserId): MatrixRoom? {
+        return findDmResult
+    }
+
     override fun startSync() = Unit
 
     override fun stopSync() = Unit
@@ -58,10 +72,6 @@ class FakeMatrixClient(
         return FakeMediaResolver()
     }
 
-    fun givenLogoutError(failure: Throwable) {
-        logoutFailure = failure
-    }
-
     override suspend fun logout() {
         delay(100)
         logoutFailure?.let { throw it }
@@ -96,4 +106,22 @@ class FakeMatrixClient(
     override fun roomMembershipObserver(): RoomMembershipObserver {
         return RoomMembershipObserver(A_SESSION_ID)
     }
+
+    // Mocks
+
+    fun givenLogoutError(failure: Throwable?) {
+        logoutFailure = failure
+    }
+
+    fun givenCreateDmResult(result: Result<RoomId>) {
+        createDmResult = result
+    }
+
+    fun givenCreateDmError(failure: Throwable?) {
+        createDmFailure = failure
+    }
+
+    fun givenFindDmResult(result: MatrixRoom?) {
+        findDmResult = result
+    }
 }

libraries/rustsdk/build.gradle

@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('matrix-rust-sdk.aar'))

libraries/rustsdk/build.gradle.kts

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("matrix-rust-sdk.aar"))