Merge remote-tracking branch 'origin/develop' into feature/bma/signIn…

…WithQrCode
element-hq · May 31, 2024 · 6b5e558 · 6b5e558
2 parents a2ac07a + d89004f
commit 6b5e558
Show file tree

Hide file tree

Showing 78 changed files with 406 additions and 246 deletions.
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomState.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomState.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.appnav.room.joined
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.SingleIn
@@ -31,6 +32,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
+@Immutable
 sealed interface LoadingRoomState {
     data object Loading : LoadingRoomState
     data object Error : LoadingRoomState

diff --git a/...AnalyticsVerificationStateMappingTests.kt → .../AnalyticsVerificationStateMappingTest.kt b/...AnalyticsVerificationStateMappingTests.kt → .../AnalyticsVerificationStateMappingTest.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class AnalyticsVerificationStateMappingTests {
+class AnalyticsVerificationStateMappingTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/...ateroom/impl/DefaultStartDMActionTests.kt → ...eateroom/impl/DefaultStartDMActionTest.kt b/...ateroom/impl/DefaultStartDMActionTests.kt → ...eateroom/impl/DefaultStartDMActionTest.kt
@@ -31,7 +31,7 @@ import io.element.android.services.analytics.test.FakeAnalyticsService
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class DefaultStartDMActionTests {
+class DefaultStartDMActionTest {
     @Test
     fun `when dm is found, assert state is updated with given room id`() = runTest {
         val matrixClient = FakeMatrixClient().apply {

diff --git a/...impl/addpeople/AddPeoplePresenterTests.kt → .../impl/addpeople/AddPeoplePresenterTest.kt b/...impl/addpeople/AddPeoplePresenterTests.kt → .../impl/addpeople/AddPeoplePresenterTest.kt
@@ -30,7 +30,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class AddPeoplePresenterTests {
+class AddPeoplePresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/...figureroom/ConfigureRoomPresenterTests.kt → ...nfigureroom/ConfigureRoomPresenterTest.kt b/...figureroom/ConfigureRoomPresenterTests.kt → ...nfigureroom/ConfigureRoomPresenterTest.kt
@@ -61,7 +61,7 @@ private const val AN_URI_FROM_CAMERA_2 = "content://uri_from_camera_2"
 private const val AN_URI_FROM_GALLERY = "content://uri_from_gallery"
 
 @RunWith(RobolectricTestRunner::class)
-class ConfigureRoomPresenterTests {
+class ConfigureRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/...impl/root/CreateRoomRootPresenterTests.kt → .../impl/root/CreateRoomRootPresenterTest.kt b/...impl/root/CreateRoomRootPresenterTests.kt → .../impl/root/CreateRoomRootPresenterTest.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class CreateRoomRootPresenterTests {
+class CreateRoomRootPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/...userlist/DefaultUserListPresenterTests.kt → .../userlist/DefaultUserListPresenterTest.kt b/...userlist/DefaultUserListPresenterTests.kt → .../userlist/DefaultUserListPresenterTest.kt
@@ -33,7 +33,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class DefaultUserListPresenterTests {
+class DefaultUserListPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/...ures/ftue/impl/DefaultFtueServiceTests.kt → ...tures/ftue/impl/DefaultFtueServiceTest.kt b/...ures/ftue/impl/DefaultFtueServiceTests.kt → ...tures/ftue/impl/DefaultFtueServiceTest.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class DefaultFtueServiceTests {
+class DefaultFtueServiceTest {
     @Test
     fun `given any check being false and session verification state being loaded, FtueState is Incomplete`() = runTest {
         val sessionVerificationService = FakeSessionVerificationService().apply {

diff --git a/...tions/NotificationsOptInPresenterTests.kt → ...ations/NotificationsOptInPresenterTest.kt b/...tions/NotificationsOptInPresenterTests.kt → ...ations/NotificationsOptInPresenterTest.kt
@@ -38,7 +38,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class NotificationsOptInPresenterTests {
+class NotificationsOptInPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 

diff --git a/.../joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt b/.../joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -42,6 +42,7 @@ data class JoinRoomState(
     }
 }
 
+@Immutable
 sealed interface ContentState {
     data class Loading(val roomIdOrAlias: RoomIdOrAlias) : ContentState
     data class Failure(val roomIdOrAlias: RoomIdOrAlias, val error: Throwable) : ContentState

diff --git a/...tion/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt b/...tion/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt
@@ -21,12 +21,12 @@ import android.view.Gravity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.graphics.Color
-import com.mapbox.mapboxsdk.camera.CameraPosition
-import com.mapbox.mapboxsdk.geometry.LatLng
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.maplibre.compose.MapLocationSettings
 import io.element.android.libraries.maplibre.compose.MapSymbolManagerSettings
 import io.element.android.libraries.maplibre.compose.MapUiSettings
+import org.maplibre.android.camera.CameraPosition
+import org.maplibre.android.geometry.LatLng
 
 /**
  * Common configuration values for the map.

diff --git a/...n/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt b/...n/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt
@@ -37,7 +37,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import com.mapbox.mapboxsdk.camera.CameraPosition
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.location.api.Location
@@ -61,9 +60,10 @@ import io.element.android.libraries.designsystem.theme.components.bottomsheet.re
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.maplibre.compose.CameraMode
 import io.element.android.libraries.maplibre.compose.CameraMoveStartedReason
-import io.element.android.libraries.maplibre.compose.MapboxMap
+import io.element.android.libraries.maplibre.compose.MapLibreMap
 import io.element.android.libraries.maplibre.compose.rememberCameraPositionState
 import io.element.android.libraries.ui.strings.CommonStrings
+import org.maplibre.android.camera.CameraPosition
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -189,7 +189,7 @@ fun SendLocationView(
                 .consumeWindowInsets(it),
             contentAlignment = Alignment.Center
         ) {
-            MapboxMap(
+            MapLibreMap(
                 styleUri = rememberTileStyleUrl(),
                 modifier = Modifier.fillMaxSize(),
                 cameraPositionState = cameraPositionState,

diff --git a/...n/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/...n/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@@ -33,8 +33,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import com.mapbox.mapboxsdk.camera.CameraPosition
-import com.mapbox.mapboxsdk.geometry.LatLng
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.compound.tokens.generated.TypographyTokens
@@ -56,12 +54,14 @@ import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.maplibre.compose.CameraMode
 import io.element.android.libraries.maplibre.compose.CameraMoveStartedReason
 import io.element.android.libraries.maplibre.compose.IconAnchor
-import io.element.android.libraries.maplibre.compose.MapboxMap
+import io.element.android.libraries.maplibre.compose.MapLibreMap
 import io.element.android.libraries.maplibre.compose.Symbol
 import io.element.android.libraries.maplibre.compose.rememberCameraPositionState
 import io.element.android.libraries.maplibre.compose.rememberSymbolState
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.toImmutableMap
+import org.maplibre.android.camera.CameraPosition
+import org.maplibre.android.geometry.LatLng
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -166,7 +166,7 @@ fun ShowLocationView(
                 )
             }
 
-            MapboxMap(
+            MapLibreMap(
                 styleUri = rememberTileStyleUrl(),
                 modifier = Modifier.fillMaxSize(),
                 images = mapOf(PIN_ID to CommonDrawables.pin).toImmutableMap(),

diff --git a/...pl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt b/...pl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
@@ -144,7 +144,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setShowL
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
-        // Simulate a LocalInspectionMode for MapboxMap
+        // Simulate a LocalInspectionMode for MapLibreMap
         CompositionLocalProvider(LocalInspectionMode provides true) {
             ShowLocationView(
                 state = state,

diff --git a/.../io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt b/.../io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.features.messages.impl.attachments.preview
 
+import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.attachments.Attachment
 
 data class AttachmentsPreviewState(
@@ -24,8 +25,11 @@ data class AttachmentsPreviewState(
     val eventSink: (AttachmentsPreviewEvents) -> Unit
 )
 
+@Immutable
 sealed interface SendActionState {
     data object Idle : SendActionState
+
+    @Immutable
     sealed interface Sending : SendActionState {
         data object Processing : Sending
         data class Uploading(val progress: Float) : Sending

diff --git a/.../src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt b/.../src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
@@ -36,7 +36,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 import io.element.android.libraries.roomselect.api.RoomSelectMode
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(RoomScope::class)
@@ -99,7 +98,7 @@ class ForwardMessagesNode @AssistedInject constructor(
         }
     }
 
-    private fun onForwardSuccess(roomIds: ImmutableList<RoomId>) {
+    private fun onForwardSuccess(roomIds: List<RoomId>) {
         navigateUp()
         if (roomIds.size == 1) {
             val targetRoomId = roomIds.first()

diff --git a/...main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt b/...main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt
@@ -18,15 +18,13 @@ package io.element.android.features.messages.impl.forward
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
@@ -38,7 +36,7 @@ import kotlinx.coroutines.launch
 
 class ForwardMessagesPresenter @AssistedInject constructor(
     @Assisted eventId: String,
-    private val matrixCoroutineScope: CoroutineScope,
+    private val appCoroutineScope: CoroutineScope,
     private val timelineProvider: TimelineProvider,
 ) : Presenter<ForwardMessagesState> {
     private val eventId: EventId = EventId(eventId)
@@ -48,41 +46,34 @@ class ForwardMessagesPresenter @AssistedInject constructor(
         fun create(eventId: String): ForwardMessagesPresenter
     }
 
-    private val forwardingActionState: MutableState<AsyncData<ImmutableList<RoomId>>> = mutableStateOf(AsyncData.Uninitialized)
+    private val forwardingActionState: MutableState<AsyncAction<List<RoomId>>> = mutableStateOf(AsyncAction.Uninitialized)
 
     fun onRoomSelected(roomIds: List<RoomId>) {
-        matrixCoroutineScope.forwardEvent(eventId, roomIds.toPersistentList(), forwardingActionState)
+        appCoroutineScope.forwardEvent(eventId, roomIds.toPersistentList(), forwardingActionState)
     }
 
     @Composable
     override fun present(): ForwardMessagesState {
-        val forwardingSucceeded by remember {
-            derivedStateOf { forwardingActionState.value.dataOrNull() }
-        }
-
         fun handleEvents(event: ForwardMessagesEvents) {
             when (event) {
-                ForwardMessagesEvents.ClearError -> forwardingActionState.value = AsyncData.Uninitialized
+                ForwardMessagesEvents.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
             }
         }
 
         return ForwardMessagesState(
-            isForwarding = forwardingActionState.value.isLoading(),
-            error = (forwardingActionState.value as? AsyncData.Failure)?.error,
-            forwardingSucceeded = forwardingSucceeded,
+            forwardAction = forwardingActionState.value,
             eventSink = { handleEvents(it) }
         )
     }
 
     private fun CoroutineScope.forwardEvent(
         eventId: EventId,
         roomIds: ImmutableList<RoomId>,
-        isForwardMessagesState: MutableState<AsyncData<ImmutableList<RoomId>>>,
+        isForwardMessagesState: MutableState<AsyncAction<List<RoomId>>>,
     ) = launch {
-        isForwardMessagesState.value = AsyncData.Loading()
-        timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).fold(
-            { isForwardMessagesState.value = AsyncData.Success(roomIds) },
-            { isForwardMessagesState.value = AsyncData.Failure(it) }
-        )
+        suspend {
+            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).getOrThrow()
+            roomIds
+        }.runCatchingUpdatingState(isForwardMessagesState)
     }
 }
diff --git a/...src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt b/...src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt
@@ -16,13 +16,10 @@
 
 package io.element.android.features.messages.impl.forward
 
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
-import kotlinx.collections.immutable.ImmutableList
 
 data class ForwardMessagesState(
-    // TODO Migrate to an Async
-    val isForwarding: Boolean,
-    val error: Throwable?,
-    val forwardingSucceeded: ImmutableList<RoomId>?,
+    val forwardAction: AsyncAction<List<RoomId>>,
     val eventSink: (ForwardMessagesEvents) -> Unit
 )
diff --git a/.../kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/.../kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
@@ -17,34 +17,31 @@
 package io.element.android.features.messages.impl.forward
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 
 open class ForwardMessagesStateProvider : PreviewParameterProvider<ForwardMessagesState> {
     override val values: Sequence<ForwardMessagesState>
         get() = sequenceOf(
             aForwardMessagesState(),
             aForwardMessagesState(
-                isForwarding = true,
+                forwardAction = AsyncAction.Loading,
             ),
             aForwardMessagesState(
-                forwardingSucceeded = persistentListOf(RoomId("!room2:domain")),
+                forwardAction = AsyncAction.Success(
+                    listOf(RoomId("!room2:domain")),
+                )
             ),
             aForwardMessagesState(
-                error = Throwable("error"),
+                forwardAction = AsyncAction.Failure(Throwable("error")),
             ),
-            // Add other states here
         )
 }
 
 fun aForwardMessagesState(
-    isForwarding: Boolean = false,
-    error: Throwable? = null,
-    forwardingSucceeded: ImmutableList<RoomId>? = null,
+    forwardAction: AsyncAction<List<RoomId>> = AsyncAction.Uninitialized,
+    eventSink: (ForwardMessagesEvents) -> Unit = {}
 ) = ForwardMessagesState(
-    isForwarding = isForwarding,
-    error = error,
-    forwardingSucceeded = forwardingSucceeded,
-    eventSink = {}
+    forwardAction = forwardAction,
+    eventSink = eventSink
 )