Format and cleanup files

2024-04-26 13:57:08 +02:00
parent d20605b8be
commit 21ddeb00fe
27 changed files with 235 additions and 111 deletions
--- 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
@@ -47,7 +47,6 @@ import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
-import io.element.android.libraries.matrix.impl.media.MediaUploadHandlerImpl
 import io.element.android.libraries.matrix.impl.notificationsettings.RustNotificationSettingsService
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
@@ -78,14 +77,10 @@ import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomInfoListener
 import org.matrix.rustcomponents.sdk.RoomListItem
-import org.matrix.rustcomponents.sdk.RoomMessageEventContentWithoutRelation
-import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
 import org.matrix.rustcomponents.sdk.TypingNotificationsListener
 import org.matrix.rustcomponents.sdk.UserPowerLevelUpdate
 import org.matrix.rustcomponents.sdk.WidgetCapabilities
 import org.matrix.rustcomponents.sdk.WidgetCapabilitiesProvider
-import org.matrix.rustcomponents.sdk.messageEventContentFromHtml
-import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
 import org.matrix.rustcomponents.sdk.use
 import uniffi.matrix_sdk.RoomPowerLevelChanges
 import java.io.File
@@ -151,7 +146,7 @@ class RustMatrixRoom(
    private val _roomNotificationSettingsStateFlow = MutableStateFlow<MatrixRoomNotificationSettingsState>(MatrixRoomNotificationSettingsState.Unknown)
    override val roomNotificationSettingsStateFlow: StateFlow<MatrixRoomNotificationSettingsState> = _roomNotificationSettingsStateFlow

-    override val liveTimeline = createTimeline(innerTimeline, isLive = true){
+    override val liveTimeline = createTimeline(innerTimeline, isLive = true) {
        _syncUpdateFlow.value = systemClock.epochMillis()
    }

@@ -179,7 +174,7 @@ class RustMatrixRoom(
            eventId = eventId.value,
            numContextEvents = 50u,
            internalIdPrefix = "focus_$eventId",
-        ).let {inner ->
+        ).let { inner ->
            createTimeline(inner, isLive = false)
        }
    }
@@ -322,7 +317,7 @@ class RustMatrixRoom(
        }
    }

-    override suspend fun sendMessage(body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit>  {
+    override suspend fun sendMessage(body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit> {
        return liveTimeline.sendMessage(body, htmlBody, mentions)
    }

@@ -340,7 +335,7 @@ class RustMatrixRoom(
        return liveTimeline.enterSpecialMode(eventId)
    }

-    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit>{
+    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit> {
        return liveTimeline.replyMessage(eventId, body, htmlBody, mentions)
    }

@@ -446,11 +441,11 @@ class RustMatrixRoom(
        return liveTimeline.sendFile(file, fileInfo, progressCallback)
    }

-    override suspend fun toggleReaction(emoji: String, eventId: EventId): Result<Unit>{
+    override suspend fun toggleReaction(emoji: String, eventId: EventId): Result<Unit> {
       return liveTimeline.toggleReaction(emoji, eventId)
    }

-    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit>{
+    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> {
        return liveTimeline.forwardEvent(eventId, roomIds)
    }

@@ -458,7 +453,7 @@ class RustMatrixRoom(
        return liveTimeline.retrySendMessage(transactionId)
    }

-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit>{
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
        return liveTimeline.cancelSend(transactionId)
    }

@@ -563,14 +558,14 @@ class RustMatrixRoom(
    override suspend fun sendPollResponse(
        pollStartId: EventId,
        answers: List<String>
-    ): Result<Unit>  {
+    ): Result<Unit> {
        return liveTimeline.sendPollResponse(pollStartId, answers)
    }

    override suspend fun endPoll(
        pollStartId: EventId,
        text: String
-    ): Result<Unit>  {
+    ): Result<Unit> {
        return liveTimeline.endPoll(pollStartId, text)
    }

@@ -579,7 +574,7 @@ class RustMatrixRoom(
        audioInfo: AudioInfo,
        waveform: List<Float>,
        progressCallback: ProgressCallback?,
-    ): Result<MediaUploadHandler>{
+    ): Result<MediaUploadHandler> {
        return liveTimeline.sendVoiceMessage(file, audioInfo, waveform, progressCallback)
    }

@@ -634,5 +629,4 @@ class RustMatrixRoom(
            inner = timeline,
        )
    }
-
 }
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -89,17 +89,16 @@ private const val PAGINATION_SIZE = 50

 class RustTimeline(
    private val inner: InnerTimeline,
-    private val isLive: Boolean,
-    private val systemClock: SystemClock,
-    private val roomCoroutineScope: CoroutineScope,
-    private val isKeyBackupEnabled: Boolean,
+    isLive: Boolean,
+    systemClock: SystemClock,
+    roomCoroutineScope: CoroutineScope,
+    isKeyBackupEnabled: Boolean,
    private val matrixRoom: MatrixRoom,
    private val dispatcher: CoroutineDispatcher,
-    private val lastLoginTimestamp: Date?,
+    lastLoginTimestamp: Date?,
    private val roomContentForwarder: RoomContentForwarder,
    private val onNewSyncedEvent: () -> Unit,
 ) : Timeline {
-
    private val initLatch = CompletableDeferred<Unit>()
    private val isInit = AtomicBoolean(false)

@@ -173,7 +172,7 @@ class RustTimeline(
        }
    }

-    // Use NonCancellable to avoid breaking the timeline when the coroutine is cancelled. 
+    // Use NonCancellable to avoid breaking the timeline when the coroutine is cancelled.
    override suspend fun paginate(direction: Timeline.PaginationDirection): Result<Boolean> = withContext(NonCancellable) {
        initLatch.await()
        runCatching {
@@ -226,7 +225,6 @@ class RustTimeline(
            }.let { items -> loadingIndicatorsPostProcessor.process(items, hasMoreToLoadBackward, hasMoreToLoadForward) }
            // Keep lastForwardIndicatorsPostProcessor last
            .let { items -> lastForwardIndicatorsPostProcessor.process(items) }
-
    }

    override fun close() {
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt
@@ -25,7 +25,6 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime
 class LastForwardIndicatorsPostProcessor(
    private val isTimelineLive: Boolean,
 ) {
-
    private val lastForwardIdentifiers = LinkedHashSet<String>()

    fun process(
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
@@ -22,7 +22,6 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime
 import io.element.android.services.toolbox.api.systemclock.SystemClock

 class LoadingIndicatorsPostProcessor(private val systemClock: SystemClock) {
-
    fun process(
        items: List<MatrixTimelineItem>,
        hasMoreToLoadBackward: Boolean,
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt
@@ -29,7 +29,6 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime
 * or add the RoomBeginning item for non DM room.
 */
 class RoomBeginningPostProcessor {
-
    fun process(
        items: List<MatrixTimelineItem>,
        isDm: Boolean,
@@ -49,7 +48,6 @@ class RoomBeginningPostProcessor {
    }

    private fun processForDM(items: List<MatrixTimelineItem>): List<MatrixTimelineItem> {
-
        // Find room creation event. This is usually index 0
        val roomCreationEventIndex = items.indexOfFirst {
            val stateEventContent = (it as? MatrixTimelineItem.Event)?.event?.content as? StateContent
@@ -83,5 +81,4 @@ class RoomBeginningPostProcessor {
            virtual = VirtualTimelineItem.RoomBeginning
        )
    }
-
 }