Merge branch 'develop' into feature/fga/power_level

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt

@@ -22,11 +22,11 @@ import org.matrix.rustcomponents.sdk.AudioInfo as RustAudioInfo
 fun RustAudioInfo.map(): AudioInfo = AudioInfo(
     duration = duration,
     size = size?.toLong(),
-    mimeType = mimetype
+    mimetype = mimetype
 )
 
 fun AudioInfo.map(): RustAudioInfo = RustAudioInfo(
     duration = duration,
     size = size?.toULong(),
-    mimetype = mimeType,
+    mimetype = mimetype,
 )

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

@@ -256,15 +256,9 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun acceptInvitation(): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun join(): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.acceptInvitation()
-        }
-    }
-
-    override suspend fun rejectInvitation(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.rejectInvitation()
+            innerRoom.join()
         }
     }