Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace our firstIfSingle extension with singleOrNull from the Kotlin library #4184

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Replace our firstIfSingle extension with singleOrNull from the Kotlin library #4184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...lin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions .../kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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 {
Expand Down
15 changes: 0 additions & 15 deletions libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/List.kt
View file
Open in desktop

This file was deleted.

Loading