Merge branch 'develop' into feature/fga/live_location_sharing_setup

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

@@ -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.

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

@@ -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)
             }