1
0
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00

Merge pull request #8993 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.38.2

Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2
This commit is contained in:
Jorge Martin Espinosa
2025-01-24 11:55:34 +01:00
committed by GitHub
3 changed files with 5 additions and 7 deletions

View File

@@ -101,7 +101,7 @@ ext.libs = [
],
element : [
'opusencoder' : "io.element.android:opusencoder:1.1.0",
'wysiwyg' : "io.element.android:wysiwyg:2.37.4"
'wysiwyg' : "io.element.android:wysiwyg:2.38.2"
],
squareup : [
'moshi' : "com.squareup.moshi:moshi:$moshi",

View File

@@ -93,3 +93,4 @@
-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
-dontwarn org.mozilla.javascript.**
-dontwarn org.slf4j.**
-dontwarn org.jspecify.annotations.NullMarked

View File

@@ -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)
}
}
}