Skip to content

Commit ed2b9a1

Browse files
authored
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
2 parents cdb8e9d + 176f8e8 commit ed2b9a1

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ext.libs = [
101101
],
102102
element : [
103103
'opusencoder' : "io.element.android:opusencoder:1.1.0",
104-
'wysiwyg' : "io.element.android:wysiwyg:2.37.4"
104+
'wysiwyg' : "io.element.android:wysiwyg:2.38.2"
105105
],
106106
squareup : [
107107
'moshi' : "com.squareup.moshi:moshi:$moshi",

vector-app/proguard-rules.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@
9393
-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
9494
-dontwarn org.mozilla.javascript.**
9595
-dontwarn org.slf4j.**
96+
-dontwarn org.jspecify.annotations.NullMarked

vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationSh
1717
import org.matrix.android.sdk.api.util.MatrixItem
1818
import org.matrix.android.sdk.api.util.toMatrixItem
1919
import javax.inject.Inject
20+
import kotlin.coroutines.resume
2021

2122
class UserLiveLocationViewStateMapper @Inject constructor(
2223
private val locationPinProvider: LocationPinProvider,
@@ -32,9 +33,7 @@ class UserLiveLocationViewStateMapper @Inject constructor(
3233
.toLocationData()
3334

3435
when {
35-
userId.isNullOrEmpty() || locationData == null -> continuation.resume(null) {
36-
// do nothing on cancellation
37-
}
36+
userId.isNullOrEmpty() || locationData == null -> continuation.resume(null)
3837
else -> {
3938
val session = activeSessionHolder.getActiveSession()
4039
val roomId = liveLocationShareAggregatedSummary.roomId
@@ -57,9 +56,7 @@ class UserLiveLocationViewStateMapper @Inject constructor(
5756
locationTimestampMillis = locationTimestampMillis,
5857
showStopSharingButton = userId == session.myUserId
5958
)
60-
continuation.resume(viewState) {
61-
// do nothing on cancellation
62-
}
59+
continuation.resume(viewState)
6360
}
6461
}
6562
}

0 commit comments

Comments
 (0)