Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2 #8993

Merged
merged 3 commits into from
Jan 24, 2025
Merged

Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2 #8993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ac7666
Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2
dependabot[bot] Jan 23, 2025
c5643ac
Fix deprecations in `UserLiveLocationViewStateMapper`
jmartinesp Jan 24, 2025
176f8e8
Fix proguard rules
jmartinesp Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions vector-app/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,4 @@
-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
-dontwarn org.mozilla.javascript.**
-dontwarn org.slf4j.**
-dontwarn org.jspecify.annotations.NullMarked
9 changes: 3 additions & 6 deletions ...src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -57,9 +56,7 @@ class UserLiveLocationViewStateMapper @Inject constructor(
locationTimestampMillis = locationTimestampMillis,
showStopSharingButton = userId == session.myUserId
)
continuation.resume(viewState) {
// do nothing on cancellation
}
continuation.resume(viewState)
}
}
}
Expand Down
Loading