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
element-hq · Jan 24, 2025 · ed2b9a1 · ed2b9a1
2 parents cdb8e9d + 176f8e8
commit ed2b9a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -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",

diff --git a/vector-app/proguard-rules.pro b/vector-app/proguard-rules.pro
@@ -93,3 +93,4 @@
 -dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
 -dontwarn org.mozilla.javascript.**
 -dontwarn org.slf4j.**
+-dontwarn org.jspecify.annotations.NullMarked
diff --git a/...src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt b/...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)
                         }
                     }
                 }