Merge branch 'develop' into feature/fga/room_list_api

2023-06-22 11:31:49 +02:00 · 2023-06-22 11:31:49 +02:00 · 01f1f73b96
commit 01f1f73b96
parent cb219e6292 d96ecaed94
35 changed files with 368 additions and 65 deletions
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@ -21,6 +21,7 @@ package io.element.android.libraries.matrix.impl
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScopeOf
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
@ -35,6 +36,7 @@ import io.element.android.libraries.matrix.api.room.RoomSummaryDataSource
 import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
+import io.element.android.libraries.matrix.impl.core.toProgressWatcher
 import io.element.android.libraries.matrix.impl.media.RustMediaLoader
 import io.element.android.libraries.matrix.impl.notification.RustNotificationService
 import io.element.android.libraries.matrix.impl.pushers.RustPushersService
@ -56,7 +58,6 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientDelegate
-import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import java.io.File
@ -118,8 +119,6 @@ class RustMatrixClient constructor(
    override val mediaLoader: MatrixMediaLoader
        get() = rustMediaLoader

-    private var slidingSyncObserverToken: TaskHandle? = null
-
    private val isSyncing = AtomicBoolean(false)

    private val roomMembershipObserver = RoomMembershipObserver()
@ -225,13 +224,13 @@ class RustMatrixClient constructor(

    override fun startSync() {
        if (isSyncing.compareAndSet(false, true)) {
-            slidingSyncObserverToken = roomList.sync()
+            roomList.sync()
        }
    }

    override fun stopSync() {
        if (isSyncing.compareAndSet(true, false)) {
-            slidingSyncObserverToken?.use { it.cancel() }
+            roomList.stopSync()
        }
    }

@ -268,9 +267,9 @@ class RustMatrixClient constructor(
    }

    @OptIn(ExperimentalUnsignedTypes::class)
-    override suspend fun uploadMedia(mimeType: String, data: ByteArray): Result<String> = withContext(dispatchers.io) {
+    override suspend fun uploadMedia(mimeType: String, data: ByteArray, progressCallback: ProgressCallback?): Result<String> = withContext(dispatchers.io) {
        runCatching {
-            client.uploadMedia(mimeType, data.toUByteArray().toList())
+            client.uploadMedia(mimeType, data.toUByteArray().toList(), progressCallback?.toProgressWatcher())
        }
    }

--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt
@ -0,0 +1,31 @@
+/*
+ * 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.impl.core
+
+import io.element.android.libraries.matrix.api.core.ProgressCallback
+import org.matrix.rustcomponents.sdk.ProgressWatcher
+import org.matrix.rustcomponents.sdk.TransmissionProgress
+
+internal class ProgressWatcherWrapper(private val progressCallback: ProgressCallback) : ProgressWatcher {
+    override fun transmissionProgress(progress: TransmissionProgress) {
+        progressCallback.onProgress(progress.current.toLong(), progress.total.toLong())
+    }
+}
+
+internal fun ProgressCallback.toProgressWatcher(): ProgressWatcher {
+    return ProgressWatcherWrapper(this)
+}
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt
@ -16,8 +16,6 @@

 package io.element.android.libraries.matrix.impl.notification

-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.notification.NotificationEvent
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.MessageType
@ -105,5 +103,6 @@ private fun MessageType.toContent(): String {
        is MessageType.Notice -> content.body
        is MessageType.Text -> content.body
        is MessageType.Video -> content.use { it.body }
+        is MessageType.Location -> content.body
    }
 }
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
@ -0,0 +1,58 @@
+/*
+ * 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.impl.room
+
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import org.matrix.rustcomponents.sdk.MessageLikeEventType
+
+fun MessageEventType.map(): MessageLikeEventType = when (this) {
+    MessageEventType.CALL_ANSWER -> MessageLikeEventType.CALL_ANSWER
+    MessageEventType.CALL_INVITE -> MessageLikeEventType.CALL_INVITE
+    MessageEventType.CALL_HANGUP -> MessageLikeEventType.CALL_HANGUP
+    MessageEventType.CALL_CANDIDATES -> MessageLikeEventType.CALL_CANDIDATES
+    MessageEventType.KEY_VERIFICATION_READY -> MessageLikeEventType.KEY_VERIFICATION_READY
+    MessageEventType.KEY_VERIFICATION_START -> MessageLikeEventType.KEY_VERIFICATION_START
+    MessageEventType.KEY_VERIFICATION_CANCEL -> MessageLikeEventType.KEY_VERIFICATION_CANCEL
+    MessageEventType.KEY_VERIFICATION_ACCEPT -> MessageLikeEventType.KEY_VERIFICATION_ACCEPT
+    MessageEventType.KEY_VERIFICATION_KEY -> MessageLikeEventType.KEY_VERIFICATION_KEY
+    MessageEventType.KEY_VERIFICATION_MAC -> MessageLikeEventType.KEY_VERIFICATION_MAC
+    MessageEventType.KEY_VERIFICATION_DONE -> MessageLikeEventType.KEY_VERIFICATION_DONE
+    MessageEventType.REACTION_SENT -> MessageLikeEventType.REACTION_SENT
+    MessageEventType.ROOM_ENCRYPTED -> MessageLikeEventType.ROOM_ENCRYPTED
+    MessageEventType.ROOM_MESSAGE -> MessageLikeEventType.ROOM_MESSAGE
+    MessageEventType.ROOM_REDACTION -> MessageLikeEventType.ROOM_REDACTION
+    MessageEventType.STICKER -> MessageLikeEventType.STICKER
+}
+
+fun MessageLikeEventType.map(): MessageEventType = when (this) {
+    MessageLikeEventType.CALL_ANSWER -> MessageEventType.CALL_ANSWER
+    MessageLikeEventType.CALL_INVITE -> MessageEventType.CALL_INVITE
+    MessageLikeEventType.CALL_HANGUP -> MessageEventType.CALL_HANGUP
+    MessageLikeEventType.CALL_CANDIDATES -> MessageEventType.CALL_CANDIDATES
+    MessageLikeEventType.KEY_VERIFICATION_READY -> MessageEventType.KEY_VERIFICATION_READY
+    MessageLikeEventType.KEY_VERIFICATION_START -> MessageEventType.KEY_VERIFICATION_START
+    MessageLikeEventType.KEY_VERIFICATION_CANCEL -> MessageEventType.KEY_VERIFICATION_CANCEL
+    MessageLikeEventType.KEY_VERIFICATION_ACCEPT -> MessageEventType.KEY_VERIFICATION_ACCEPT
+    MessageLikeEventType.KEY_VERIFICATION_KEY -> MessageEventType.KEY_VERIFICATION_KEY
+    MessageLikeEventType.KEY_VERIFICATION_MAC -> MessageEventType.KEY_VERIFICATION_MAC
+    MessageLikeEventType.KEY_VERIFICATION_DONE -> MessageEventType.KEY_VERIFICATION_DONE
+    MessageLikeEventType.REACTION_SENT -> MessageEventType.REACTION_SENT
+    MessageLikeEventType.ROOM_ENCRYPTED -> MessageEventType.ROOM_ENCRYPTED
+    MessageLikeEventType.ROOM_MESSAGE -> MessageEventType.ROOM_MESSAGE
+    MessageLikeEventType.ROOM_REDACTION -> MessageEventType.ROOM_REDACTION
+    MessageLikeEventType.STICKER -> MessageEventType.STICKER
+}
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.impl.room
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScopeOf
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.ProgressCallback
 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
@ -28,10 +29,12 @@ import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventType
+import io.element.android.libraries.matrix.impl.core.toProgressWatcher
 import io.element.android.libraries.matrix.impl.media.map
 import io.element.android.libraries.matrix.impl.timeline.RustMatrixTimeline
 import io.element.android.libraries.matrix.impl.timeline.timelineDiffFlow
@ -264,27 +267,37 @@ class RustMatrixRoom(
        }
    }

-    override suspend fun sendImage(file: File, thumbnailFile: File, imageInfo: ImageInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
+    override suspend fun canSendEvent(type: MessageEventType): Result<Boolean> = withContext(coroutineDispatchers.io) {
        runCatching {
-            innerRoom.sendImage(file.path, thumbnailFile.path, imageInfo.map())
+            innerRoom.member(sessionId.value).use { it.canSendMessage(type.map()) }
        }
    }

-    override suspend fun sendVideo(file: File, thumbnailFile: File, videoInfo: VideoInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
+    override suspend fun sendImage(file: File, thumbnailFile: File, imageInfo: ImageInfo, progressCallback: ProgressCallback?): Result<Unit> = withContext(
+        coroutineDispatchers.io
+    ) {
        runCatching {
-            innerRoom.sendVideo(file.path, thumbnailFile.path, videoInfo.map())
+            innerRoom.sendImage(file.path, thumbnailFile.path, imageInfo.map(), progressCallback?.toProgressWatcher())
        }
    }

-    override suspend fun sendAudio(file: File, audioInfo: AudioInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
+    override suspend fun sendVideo(file: File, thumbnailFile: File, videoInfo: VideoInfo, progressCallback: ProgressCallback?): Result<Unit> = withContext(
+        coroutineDispatchers.io
+    ) {
        runCatching {
-            innerRoom.sendAudio(file.path, audioInfo.map())
+            innerRoom.sendVideo(file.path, thumbnailFile.path, videoInfo.map(), progressCallback?.toProgressWatcher())
        }
    }

-    override suspend fun sendFile(file: File, fileInfo: FileInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
+    override suspend fun sendAudio(file: File, audioInfo: AudioInfo, progressCallback: ProgressCallback?): Result<Unit> = withContext(coroutineDispatchers.io) {
        runCatching {
-            innerRoom.sendFile(file.path, fileInfo.map())
+            innerRoom.sendAudio(file.path, audioInfo.map(), progressCallback?.toProgressWatcher())
+        }
+    }
+
+    override suspend fun sendFile(file: File, fileInfo: FileInfo, progressCallback: ProgressCallback?): Result<Unit> = withContext(coroutineDispatchers.io) {
+        runCatching {
+            innerRoom.sendFile(file.path, fileInfo.map(), progressCallback?.toProgressWatcher())
        }
    }

--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
@ -65,9 +65,11 @@ class EventMessageMapper {
                is MessageType.Video -> {
                    VideoMessageType(type.content.body, type.content.source.map(), type.content.info?.map())
                }
+                is MessageType.Location,
                null -> {
                    UnknownMessageType
                }
+
            }
        }
        val inReplyToId = it.inReplyTo()?.eventId?.let(::EventId)