Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fga/live_location_sharing_setup

Browse source
This commit is contained in:
ganfra 2026-03-12 12:48:55 +01:00
commit e8c2790595
131 changed files with 825 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
View file

@ -214,7 +214,7 @@ class RustEncryptionService(
override suspend fun recover(recoveryKey: String): Result<Unit> = withContext(dispatchers.io) {
runCatchingExceptions {
service.recover(recoveryKey)
service.recoverAndFixBackup(recoveryKey)
}.recoverCatching {
when (it) {
// We ignore import errors because the user will be notified about them via the "Key storage out of sync" detection.

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
View file

@ -324,7 +324,7 @@ class JoinedRustRoom(
override suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit> = withContext(roomDispatcher) {
runCatchingExceptions {
innerRoom.reportContent(eventId = eventId.value, score = null, reason = reason)
innerRoom.reportContent(eventId = eventId.value, reason = reason)
if (blockUserId != null) {
innerRoom.ignoreUser(blockUserId.value)
}