Merge pull request #4184 from element-hq/feature/bma/removeFirstIfSingle

Replace our firstIfSingle extension with singleOrNull from the Kotlin library
element-hq · Jan 22, 2025 · 7d73758 · 7d73758
2 parents 8ff31b5 + 2e53238
commit 7d73758
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/...lin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt b/...lin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
@@ -18,7 +18,6 @@ import io.element.android.features.knockrequests.impl.data.KnockRequestPresentab
 import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.architecture.Presenter
 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
@@ -79,7 +78,7 @@ class KnockRequestsBannerPresenter @Inject constructor(
         knockRequests: List<KnockRequestPresentable>,
         displayAcceptError: MutableState<Boolean>,
     ) = launch {
-        val knockRequest = knockRequests.firstIfSingle()
+        val knockRequest = knockRequests.singleOrNull()
         if (knockRequest != null) {
             knockRequestsService.acceptKnockRequest(knockRequest, optimistic = true)
                 .onFailure {

diff --git a/.../kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt b/.../kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
@@ -12,7 +12,6 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import io.element.android.features.knockrequests.impl.R
 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(
@@ -22,8 +21,8 @@ data class KnockRequestsBannerState(
     val canAccept: Boolean,
     val eventSink: (KnockRequestsBannerEvents) -> Unit,
 ) {
-    val subtitle = knockRequests.firstIfSingle()?.userId?.value
-    val reason = knockRequests.firstIfSingle()?.reason
+    val subtitle = knockRequests.singleOrNull()?.userId?.value
+    val reason = knockRequests.singleOrNull()?.reason
 
     @Composable
     fun formattedTitle(): String {

diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/List.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/List.kt