Fix more and more issues

element-hq · Oct 3, 2024 · 54bb9c0 · 54bb9c0
1 parent de931f7
commit 54bb9c0
Show file tree

Hide file tree

Showing 23 changed files with 251 additions and 40 deletions.
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
@@ -43,6 +43,7 @@ import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.lambdaSuspendRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
@@ -145,7 +146,7 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - ensure default pusher is registered with default provider`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaSuspendRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
         val sessionVerificationService = FakeSessionVerificationService(
@@ -178,7 +179,7 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - ensure default pusher is registered with default provider - fail to register`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaSuspendRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.failure(AN_EXCEPTION)
         }
         val sessionVerificationService = FakeSessionVerificationService(
@@ -211,7 +212,7 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - ensure current provider is registered with current distributor`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaSuspendRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
         val sessionVerificationService = FakeSessionVerificationService(
@@ -256,7 +257,7 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - if current push provider does not have current distributor, the first one is used`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaSuspendRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
         val sessionVerificationService = FakeSessionVerificationService(
@@ -422,7 +423,7 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - case two push providers but first one does not have distributor - second one will be used`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaSuspendRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
         val sessionVerificationService = FakeSessionVerificationService(

diff --git a/features/cachecleaner/api/build.gradle.kts b/features/cachecleaner/api/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2023, 2024 New Vector Ltd.
  *
@@ -7,13 +9,14 @@
 
 plugins {
     id("io.element.android-library")
-    alias(libs.plugins.anvil)
 }
 
 android {
     namespace = "io.element.android.features.cachecleaner.api"
 }
 
+setupAnvil()
+
 dependencies {
     implementation(projects.libraries.architecture)
     implementation(libs.androidx.startup)

diff --git a/.../call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/.../call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -109,12 +109,7 @@ class CallScreenPresenterTest {
             assertThat(initialState.isInWidgetMode).isTrue()
             assertThat(widgetProvider.getWidgetCalled).isTrue()
             assertThat(widgetDriver.runCalledCount).isEqualTo(1)
-            // Called several times because of the recomposition
-            analyticsLambda.assertions().isCalledExactly(2)
-                .withSequence(
-                    listOf(value(MobileScreen.ScreenName.RoomCall)),
-                    listOf(value(MobileScreen.ScreenName.RoomCall))
-                )
+            analyticsLambda.assertions().isCalledOnce().with(value(MobileScreen.ScreenName.RoomCall))
             sendCallNotificationIfNeededLambda.assertions().isCalledOnce()
         }
     }

diff --git a/features/enterprise/impl/build.gradle.kts b/features/enterprise/impl/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2024 New Vector Ltd.
  *
@@ -6,13 +8,14 @@
  */
 plugins {
     id("io.element.android-library")
-    alias(libs.plugins.anvil)
 }
 
 android {
     namespace = "io.element.android.features.enterprise.impl"
 }
 
+setupAnvil()
+
 dependencies {
     implementation(projects.anvilannotations)
     api(projects.features.enterprise.api)

diff --git a/features/ftue/test/build.gradle.kts b/features/ftue/test/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2024 New Vector Ltd.
  *
@@ -7,14 +9,15 @@
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
     id("kotlin-parcelize")
 }
 
 android {
     namespace = "io.element.android.features.ftue.test"
 }
 
+setupAnvil()
+
 dependencies {
     implementation(projects.features.ftue.api)
     implementation(projects.tests.testutils)

diff --git a/features/licenses/impl/build.gradle.kts b/features/licenses/impl/build.gradle.kts
@@ -10,7 +10,6 @@ import extension.setupAnvil
 plugins {
     id("io.element.android-compose-library")
     id("kotlin-parcelize")
-    alias(libs.plugins.anvil)
     alias(libs.plugins.kotlin.serialization)
 }
 

diff --git a/...io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt b/...io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
@@ -51,7 +51,7 @@ class WebViewMessageInterceptor(
             }
 
             override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
-                request ?: return super.shouldOverrideUrlLoading(view, request)
+                request ?: return false
                 // Load the URL in a Chrome Custom Tab, and return true to cancel the load
                 onOpenExternalUrl(request.url.toString())
                 return true

diff --git a/features/migration/impl/build.gradle.kts b/features/migration/impl/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2024 New Vector Ltd.
  *
@@ -7,13 +9,14 @@
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
 }
 
 android {
     namespace = "io.element.android.features.migration.impl"
 }
 
+setupAnvil()
+
 dependencies {
     implementation(projects.features.migration.api)
     implementation(projects.libraries.architecture)

diff --git a/features/roomdirectory/impl/build.gradle.kts b/features/roomdirectory/impl/build.gradle.kts
@@ -9,7 +9,6 @@ import extension.setupAnvil
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
     id("kotlin-parcelize")
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 # Project
 android_gradle_plugin = "8.7.0"
 kotlin = "2.0.20"
-kotlinpoetKsp = "1.17.0"
+kotlinpoetKsp = "1.18.1"
 ksp = "2.0.20-1.0.25"
 firebaseAppDistribution = "5.0.0"
 

diff --git a/...o/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt b/...o/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt
@@ -7,7 +7,6 @@
 
 package io.element.android.libraries.designsystem.theme.components.bottomsheet
 
-import androidx.compose.animation.core.DecayAnimationSpec
 import androidx.compose.animation.core.SpringSpec
 import androidx.compose.animation.core.exponentialDecay
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -296,13 +295,9 @@ internal object AnchoredDraggableDefaults {
     /**
      * The default animation used by [AnchoredDraggableState].
      */
-    @get:ExperimentalMaterial3Api
-    @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
     @ExperimentalMaterial3Api
     val SnapAnimationSpec = SpringSpec<Float>()
 
-    @get:ExperimentalMaterial3Api
-    @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
     @ExperimentalMaterial3Api
     val DecayAnimationSpec = exponentialDecay<Float>()
 }
diff --git a/libraries/mediapickers/api/build.gradle.kts b/libraries/mediapickers/api/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2023, 2024 New Vector Ltd.
  *
@@ -7,9 +9,10 @@
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
 }
 
+setupAnvil()
+
 android {
     namespace = "io.element.android.libraries.mediapickers.api"
 

diff --git a/libraries/mediapickers/test/build.gradle.kts b/libraries/mediapickers/test/build.gradle.kts
@@ -1,3 +1,5 @@
+import extension.setupAnvil
+
 /*
  * Copyright 2023, 2024 New Vector Ltd.
  *
@@ -7,9 +9,10 @@
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
 }
 
+setupAnvil()
+
 android {
     namespace = "io.element.android.libraries.mediapickers.test"
 

diff --git a/.../push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt b/.../push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakePushHandler(
-    private val handleResult: (PushData) -> Unit = { lambdaError() }
+    private val handleResult: suspend (PushData) -> Unit = { lambdaError() }
 ) : PushHandler {
     override suspend fun handle(pushData: PushData) {
         handleResult(pushData)

diff --git a/...io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt b/...io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.push.test.test.FakePushHandler
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.lambdaSuspendRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -31,7 +32,7 @@ import org.robolectric.RobolectricTestRunner
 class VectorFirebaseMessagingServiceTest {
     @Test
     fun `test receiving invalid data`() = runTest {
-        val lambda = lambdaRecorder<PushData, Unit>(ensureNeverCalled = true) { }
+        val lambda = lambdaSuspendRecorder<PushData, Unit>(ensureNeverCalled = true) { }
         val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
             pushHandler = FakePushHandler(handleResult = lambda)
         )
@@ -40,7 +41,7 @@ class VectorFirebaseMessagingServiceTest {
 
     @Test
     fun `test receiving valid data`() = runTest {
-        val lambda = lambdaRecorder<PushData, Unit> { }
+        val lambda = lambdaSuspendRecorder<PushData, Unit> { }
         val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
             pushHandler = FakePushHandler(handleResult = lambda)
         )

diff --git a/...ent/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt b/...ent/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
@@ -22,6 +22,7 @@ import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.libraries.pushproviders.unifiedpush.registration.EndpointRegistrationHandler
 import io.element.android.libraries.pushproviders.unifiedpush.registration.RegistrationResult
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.lambdaSuspendRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -50,7 +51,7 @@ class VectorUnifiedPushMessagingReceiverTest {
     @Test
     fun `onMessage valid invoke the push handler`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
-        val pushHandlerResult = lambdaRecorder<PushData, Unit> {}
+        val pushHandlerResult = lambdaSuspendRecorder<PushData, Unit> {}
         val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver(
             pushHandler = FakePushHandler(
                 handleResult = pushHandlerResult
@@ -75,7 +76,7 @@ class VectorUnifiedPushMessagingReceiverTest {
     @Test
     fun `onMessage invalid does not invoke the push handler`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
-        val pushHandlerResult = lambdaRecorder<PushData, Unit> {}
+        val pushHandlerResult = lambdaSuspendRecorder<PushData, Unit> {}
         val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver(
             pushHandler = FakePushHandler(
                 handleResult = pushHandlerResult
@@ -97,7 +98,7 @@ class VectorUnifiedPushMessagingReceiverTest {
             storeUpEndpointResult = storeUpEndpointResult,
         )
         val endpointRegistrationHandler = EndpointRegistrationHandler()
-        val handleResult = lambdaRecorder<String, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val handleResult = lambdaSuspendRecorder<String, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val unifiedPushNewGatewayHandler = FakeUnifiedPushNewGatewayHandler(
             handleResult = handleResult
         )
@@ -137,7 +138,7 @@ class VectorUnifiedPushMessagingReceiverTest {
             storeUpEndpointResult = storeUpEndpointResult,
         )
         val endpointRegistrationHandler = EndpointRegistrationHandler()
-        val handleResult = lambdaRecorder<String, String, String, Result<Unit>> { _, _, _ -> Result.failure(AN_EXCEPTION) }
+        val handleResult = lambdaSuspendRecorder<String, String, String, Result<Unit>> { _, _, _ -> Result.failure(AN_EXCEPTION) }
         val unifiedPushNewGatewayHandler = FakeUnifiedPushNewGatewayHandler(
             handleResult = handleResult
         )

diff --git a/.../impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt b/.../impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
@@ -9,6 +9,7 @@ package io.element.android.libraries.roomselect.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -22,6 +23,7 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.roomselect.api.RoomSelectMode
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
@@ -50,7 +52,7 @@ class RoomSelectPresenter @AssistedInject constructor(
 
         val roomSummaryDetailsList by dataSource.roomSummaries.collectAsState(initial = persistentListOf())
 
-        val searchResults by remember {
+        val searchResults by remember<State<SearchBarResultState<ImmutableList<RoomSummary>>>> {
             derivedStateOf {
                 when {
                     roomSummaryDetailsList.isNotEmpty() -> SearchBarResultState.Results(roomSummaryDetailsList.toImmutableList())

diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -10,7 +10,6 @@ package extension
 import Versions
 import com.android.build.api.dsl.CommonExtension
 import isEnterpriseBuild
-import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import java.io.File
 
@@ -44,12 +43,13 @@ fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
         }
         checkDependencies = false
         abortOnError = true
+        ignoreTestSources = true
         ignoreTestFixturesSources = true
         checkGeneratedSources = false
     }
 }
 
-fun CommonExtension<*, *, *, *, *, *>.composeConfig(libs: LibrariesForLibs) {
+fun CommonExtension<*, *, *, *, *, *>.composeConfig() {
 
     buildFeatures {
         compose = true

diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 
 android {
     androidConfig(project)
-    composeConfig(libs)
+    composeConfig()
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }

diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 
 android {
     androidConfig(project)
-    composeConfig(libs)
+    composeConfig()
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }