From a6038559331b78462ccf0724d23a2afd305ab0cb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Tue, 11 Jun 2024 17:05:12 +0200
Subject: [PATCH] Sending queue : code quality

---
 .../io/element/android/appnav/loggedin/SendingQueue.kt      | 1 -
 .../io/element/android/appnav/loggedin/SendingQueueTest.kt  | 2 --
 .../impl/timeline/components/TimelineEventTimestampView.kt  | 1 -
 .../android/libraries/matrix/api/timeline/Timeline.kt       | 1 -
 .../android/libraries/matrix/impl/timeline/RustTimeline.kt  | 6 ++----
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendingQueue.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendingQueue.kt
index 2bee213e4b..979683de96 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendingQueue.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendingQueue.kt
@@ -41,7 +41,6 @@ class SendingQueue @Inject constructor(
     private val matrixClient: MatrixClient,
     private val networkMonitor: NetworkMonitor,
 ) {
-
     private val retryCount = AtomicInteger(0)
 
     fun launchIn(coroutineScope: CoroutineScope) {
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendingQueueTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendingQueueTest.kt
index 937370e75f..a31ef0efc3 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendingQueueTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendingQueueTest.kt
@@ -29,7 +29,6 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class) class SendingQueueTest {
-
     private val matrixClient = FakeMatrixClient()
     private val networkMonitor = FakeNetworkMonitor()
     private val sut = SendingQueue(matrixClient, networkMonitor)
@@ -77,5 +76,4 @@ import org.junit.Test
                 listOf(value(true)),
             )
     }
-
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
index 1f68206e17..5ec0262205 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
@@ -73,4 +73,3 @@ internal fun TimelineEventTimestampViewPreview(@PreviewParameter(TimelineItemEve
 object TimelineEventTimestampViewDefaults {
     val spacing = 16.dp
 }
-
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
index 939b34c326..d3200ed92c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
@@ -162,5 +162,4 @@ interface Timeline : AutoCloseable {
         waveform: List<Float>,
         progressCallback: ProgressCallback?
     ): Result<MediaUploadHandler>
-
 }
diff --git 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
index 435b16a8ce..025700c3bd 100644
--- 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
@@ -263,9 +263,8 @@ class RustTimeline(
 
     override suspend fun sendMessage(body: String, htmlBody: String?, mentions: List<Mention>): Result<Unit> = withContext(dispatcher) {
         messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()).use { content ->
-            runCatching {
+            runCatching<Unit> {
                 inner.send(content)
-                Unit
             }
         }
     }
@@ -298,7 +297,7 @@ class RustTimeline(
         mentions: List<Mention>,
     ): Result<Unit> =
         withContext(dispatcher) {
-            runCatching {
+            runCatching<Unit> {
                 when {
                     originalEventId != null -> {
                         val editedEvent = specialModeEventTimelineItem ?: inner.getEventTimelineItemByEventId(originalEventId.value)
@@ -314,7 +313,6 @@ class RustTimeline(
                         inner.getEventTimelineItemByTransactionId(transactionId.value).use {
                             inner.redactEvent(item = it, reason = null)
                         }
-                        Unit
                     }
                     else -> {
                         error("Either originalEventId or transactionId must be non null")