From 6ac7666a86ff8c3ade560022b2281519875aee1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 23:06:08 +0000 Subject: [PATCH 1/3] Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2 Bumps [io.element.android:wysiwyg](https://github.com/element-hq/matrix-rich-text-editor) from 2.37.4 to 2.38.2. - [Changelog](https://github.com/element-hq/matrix-rich-text-editor/blob/main/CHANGELOG.md) - [Commits](https://github.com/element-hq/matrix-rich-text-editor/commits/2.38.2) --- updated-dependencies: - dependency-name: io.element.android:wysiwyg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1a99376a79d..a0ac311963f 100644 --- 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", 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 2/3] 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 a07c2e2a7a1..119832a9479 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) } } } From 176f8e86189f09618dd0dfe4cffe151916e60536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 24 Jan 2025 10:25:12 +0100 Subject: [PATCH 3/3] Fix proguard rules --- vector-app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/vector-app/proguard-rules.pro b/vector-app/proguard-rules.pro index 6e8afc44e32..0fed1488185 100644 --- 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