Merge pull request #4067 from element-hq/feature/fga/knock_requests_sdk

feat(knock requests) : branch logic for handling knock requests

Author: ganfra

features/knockrequests/impl/build.gradle.kts

@@ -14,6 +14,11 @@ plugins {
 
 android {
     namespace = "io.element.android.features.knockrequests.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 setupAnvil()
@@ -26,11 +31,17 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.featureflag.api)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testImplementation(projects.libraries.featureflag.test)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 }

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/KnockRequest.kt

@@ -8,35 +8,85 @@
 package io.element.android.features.knockrequests.impl.banner
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
+import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.architecture.Presenter
-import kotlinx.collections.immutable.persistentListOf
+import io.element.android.libraries.core.coroutine.mapState
+import io.element.android.libraries.core.extensions.firstIfSingle
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class KnockRequestsBannerPresenter @Inject constructor() : Presenter<KnockRequestsBannerState> {
+private const val ACCEPT_ERROR_DISPLAY_DURATION = 1500L
+
+class KnockRequestsBannerPresenter @Inject constructor(
+    private val knockRequestsService: KnockRequestsService,
+    private val appCoroutineScope: CoroutineScope,
+) : Presenter<KnockRequestsBannerState> {
     @Composable
     override fun present(): KnockRequestsBannerState {
-        var shouldShowBanner by remember { mutableStateOf(false) }
+        val knockRequests by remember {
+            knockRequestsService.knockRequestsFlow.mapState { knockRequests ->
+                knockRequests.dataOrNull().orEmpty()
+                    .filter { !it.isSeen }
+                    .toImmutableList()
+            }
+        }.collectAsState()
+
+        val permissions by knockRequestsService.permissionsFlow.collectAsState()
+        val showAcceptError = remember { mutableStateOf(false) }
+
+        val shouldShowBanner by remember {
+            derivedStateOf {
+                permissions.canHandle && knockRequests.isNotEmpty()
+            }
+        }
 
         fun handleEvents(event: KnockRequestsBannerEvents) {
             when (event) {
-                is KnockRequestsBannerEvents.AcceptSingleRequest -> Unit
+                is KnockRequestsBannerEvents.AcceptSingleRequest -> {
+                    appCoroutineScope.acceptSingleKnockRequest(
+                        knockRequests = knockRequests,
+                        displayAcceptError = showAcceptError,
+                    )
+                }
                 is KnockRequestsBannerEvents.Dismiss -> {
-                    shouldShowBanner = false
+                    appCoroutineScope.launch {
+                        knockRequestsService.markAllKnockRequestsAsSeen()
+                    }
                 }
             }
         }
 
         return KnockRequestsBannerState(
-            knockRequests = persistentListOf(),
-            acceptAction = AsyncAction.Uninitialized,
-            canAccept = false,
+            knockRequests = knockRequests,
+            displayAcceptError = showAcceptError.value,
+            canAccept = permissions.canAccept,
             isVisible = shouldShowBanner,
             eventSink = ::handleEvents,
         )
     }
+
+    private fun CoroutineScope.acceptSingleKnockRequest(
+        knockRequests: List<KnockRequestPresentable>,
+        displayAcceptError: MutableState<Boolean>,
+    ) = launch {
+        val knockRequest = knockRequests.firstIfSingle()
+        if (knockRequest != null) {
+            knockRequestsService.acceptKnockRequest(knockRequest, optimistic = true)
+                .onFailure {
+                    displayAcceptError.value = true
+                    delay(ACCEPT_ERROR_DISPLAY_DURATION)
+                    displayAcceptError.value = false
+                }
+        }
+    }
 }

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt

@@ -10,17 +10,15 @@ package io.element.android.features.knockrequests.impl.banner
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
-import io.element.android.features.knockrequests.impl.KnockRequest
 import io.element.android.features.knockrequests.impl.R
-import io.element.android.features.knockrequests.impl.getBestName
-import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
 import io.element.android.libraries.core.extensions.firstIfSingle
 import kotlinx.collections.immutable.ImmutableList
 
 data class KnockRequestsBannerState(
     val isVisible: Boolean,
-    val knockRequests: ImmutableList<KnockRequest>,
-    val acceptAction: AsyncAction<Unit>,
+    val knockRequests: ImmutableList<KnockRequestPresentable>,
+    val displayAcceptError: Boolean,
     val canAccept: Boolean,
     val eventSink: (KnockRequestsBannerEvents) -> Unit,
 ) {

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt

@@ -8,9 +8,8 @@
 package io.element.android.features.knockrequests.impl.banner
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.knockrequests.impl.KnockRequest
-import io.element.android.features.knockrequests.impl.aKnockRequest
-import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
+import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import kotlinx.collections.immutable.toImmutableList
 
 class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsBannerState> {
@@ -19,7 +18,7 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             aKnockRequestsBannerState(),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(
+                    aKnockRequestPresentable(
                         reason = "A very long reason that should probably be truncated, " +
                             "but could be also expanded so you can see it over the lines, wow," +
                             "very amazing reason, I know, right, I'm so good at writing reasons."
@@ -28,30 +27,27 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(),
-                    aKnockRequest(displayName = "Alice")
+                    aKnockRequestPresentable(),
+                    aKnockRequestPresentable(displayName = "Alice")
                 )
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(),
-                    aKnockRequest(displayName = "Alice"),
-                    aKnockRequest(displayName = "Bob"),
-                    aKnockRequest(displayName = "Charlie")
+                    aKnockRequestPresentable(),
+                    aKnockRequestPresentable(displayName = "Alice"),
+                    aKnockRequestPresentable(displayName = "Bob"),
+                    aKnockRequestPresentable(displayName = "Charlie")
                 )
             ),
             aKnockRequestsBannerState(
                 canAccept = false
             ),
             aKnockRequestsBannerState(
-                acceptAction = AsyncAction.Loading
-            ),
-            aKnockRequestsBannerState(
-                acceptAction = AsyncAction.Failure(Throwable("Failed to accept knock"))
+                displayAcceptError = true
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(
+                    aKnockRequestPresentable(
                         displayName = "A_very_long_display_name_so_that_the_text_can_be_displayed_on_multiple_lines"
                     )
                 )
@@ -60,14 +56,14 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
 }
 
 fun aKnockRequestsBannerState(
-    knockRequests: List<KnockRequest> = listOf(aKnockRequest()),
-    acceptAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    knockRequests: List<KnockRequestPresentable> = listOf(aKnockRequestPresentable()),
+    displayAcceptError: Boolean = false,
     canAccept: Boolean = true,
     isVisible: Boolean = true,
     eventSink: (KnockRequestsBannerEvents) -> Unit = {}
 ) = KnockRequestsBannerState(
     knockRequests = knockRequests.toImmutableList(),
-    acceptAction = acceptAction,
+    displayAcceptError = displayAcceptError,
     canAccept = canAccept,
     isVisible = isVisible,
     eventSink = eventSink,