From 9a391d330c3c21a48e772a577c54753beef1ef11 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Dec 2022 18:35:41 +0100 Subject: [PATCH] Fix some warnings --- .../io/element/android/x/features/messages/MessagesScreen.kt | 1 - .../java/io/element/android/x/core/compose/LogCompositions.kt | 2 +- .../src/main/java/io/element/android/x/matrix/MatrixClient.kt | 2 ++ .../main/java/io/element/android/x/matrix/room/MatrixRoom.kt | 4 ++-- .../io/element/android/x/matrix/room/RoomSummaryDataSource.kt | 2 ++ .../io/element/android/x/matrix/timeline/MatrixTimeline.kt | 2 ++ 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt index 53be142766..7663cba89c 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt @@ -476,7 +476,6 @@ fun MessageEventRow( content = messageEvent.content, modifier = contentModifier ) - else -> TODO() /* compiler issue ? */ } } MessagesReactionsView( diff --git a/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt b/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt index ba1371335f..ab2daa385a 100644 --- a/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt +++ b/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt @@ -10,7 +10,7 @@ import io.element.android.x.core.BuildConfig // copied at the call site to ensure that its logging only recompositions from the // original call site. @Composable -inline fun LogCompositions(tag: String, msg: String) { +fun LogCompositions(tag: String, msg: String) { if (BuildConfig.DEBUG) { val ref = remember { Ref(0) } SideEffect { ref.value++ } diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt index e392d54e74..5f56208e06 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt @@ -150,6 +150,7 @@ class MatrixClient internal constructor( } } + @OptIn(ExperimentalUnsignedTypes::class) suspend fun loadMediaContentForSource(source: MediaSource): Result = withContext(dispatchers.io) { runCatching { @@ -157,6 +158,7 @@ class MatrixClient internal constructor( } } + @OptIn(ExperimentalUnsignedTypes::class) suspend fun loadMediaThumbnailForSource( source: MediaSource, width: Long, diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt index f2e38bc2bf..3bf8b79003 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt @@ -88,7 +88,7 @@ class MatrixRoom( suspend fun editMessage(originalEventId: String, message: String): Result = withContext(coroutineDispatchers.io) { val transactionId = genTransactionId() - val content = messageEventContentFromMarkdown(message) + // val content = messageEventContentFromMarkdown(message) runCatching { room.edit(/* TODO use content */ message, originalEventId, transactionId) } @@ -96,7 +96,7 @@ class MatrixRoom( suspend fun replyMessage(eventId: String, message: String): Result = withContext(coroutineDispatchers.io) { val transactionId = genTransactionId() - val content = messageEventContentFromMarkdown(message) + // val content = messageEventContentFromMarkdown(message) runCatching { room.sendReply(/* TODO use content */ message, eventId, transactionId) } diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/RoomSummaryDataSource.kt index 5ec62cef06..71ef62a4d8 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/RoomSummaryDataSource.kt @@ -4,6 +4,7 @@ import io.element.android.x.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.sync.roomListDiff import io.element.android.x.matrix.sync.state import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.cancelChildren @@ -81,6 +82,7 @@ internal class RustRoomSummaryDataSource( coroutineScope.cancel() } + @OptIn(FlowPreview::class) override fun roomSummaries(): Flow> { return roomSummaries.sample(50) } diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt index 3a65bedadf..93c5b37d15 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt @@ -3,6 +3,7 @@ package io.element.android.x.matrix.timeline import io.element.android.x.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.room.MatrixRoom import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.sample @@ -36,6 +37,7 @@ class MatrixTimeline( private val timelineItems: MutableStateFlow> = MutableStateFlow(emptyList()) + @OptIn(FlowPreview::class) fun timelineItems(): Flow> { return timelineItems.sample(50) }