From c5643acaee96a3af0e449b696c701f8b7ab3c439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 24 Jan 2025 09:51:01 +0100 Subject: [PATCH] Fix deprecations in `UserLiveLocationViewStateMapper` --- .../location/live/map/UserLiveLocationViewStateMapper.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt index a07c2e2a7a..119832a947 100644 --- a/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt +++ b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt @@ -17,6 +17,7 @@ import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationSh import org.matrix.android.sdk.api.util.MatrixItem import org.matrix.android.sdk.api.util.toMatrixItem import javax.inject.Inject +import kotlin.coroutines.resume class UserLiveLocationViewStateMapper @Inject constructor( private val locationPinProvider: LocationPinProvider, @@ -32,9 +33,7 @@ class UserLiveLocationViewStateMapper @Inject constructor( .toLocationData() when { - userId.isNullOrEmpty() || locationData == null -> continuation.resume(null) { - // do nothing on cancellation - } + userId.isNullOrEmpty() || locationData == null -> continuation.resume(null) else -> { val session = activeSessionHolder.getActiveSession() val roomId = liveLocationShareAggregatedSummary.roomId @@ -57,9 +56,7 @@ class UserLiveLocationViewStateMapper @Inject constructor( locationTimestampMillis = locationTimestampMillis, showStopSharingButton = userId == session.myUserId ) - continuation.resume(viewState) { - // do nothing on cancellation - } + continuation.resume(viewState) } } }