Merge pull request #2333 from element-hq/feature/jme/use-unencrypted-room-calls-if-room-is-not-encrypted

Use `MatrixRoom.isEncrypted` value to set encryption mode in room calls

changelog.d/2333.feature

@@ -0,0 +1 @@
+Allow joining unencrypted video calls in non encrypted rooms.

features/call/src/main/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProvider.kt

@@ -43,7 +43,7 @@ class DefaultCallWidgetProvider @Inject constructor(
     ): Result<Pair<MatrixWidgetDriver, String>> = runCatching {
         val room = matrixClientsProvider.getOrRestore(sessionId).getOrThrow().getRoom(roomId) ?: error("Room not found")
         val baseUrl = appPreferencesStore.getCustomElementCallBaseUrlFlow().firstOrNull() ?: ElementCallConfig.DEFAULT_BASE_URL
-        val widgetSettings = callWidgetSettingsProvider.provide(baseUrl)
+        val widgetSettings = callWidgetSettingsProvider.provide(baseUrl, encrypted = room.isEncrypted)
         val callUrl = room.generateWidgetWebViewUrl(widgetSettings, clientId, languageTag, theme).getOrThrow()
         room.getWidgetDriver(widgetSettings).getOrThrow() to callUrl
     }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt

@@ -21,6 +21,7 @@ import java.util.UUID
 interface CallWidgetSettingsProvider {
     fun provide(
         baseUrl: String,
-        widgetId: String = UUID.randomUUID().toString()
+        widgetId: String = UUID.randomUUID().toString(),
+        encrypted: Boolean,
     ): MatrixWidgetSettings
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt

@@ -27,7 +27,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultCallWidgetSettingsProvider @Inject constructor() : CallWidgetSettingsProvider {
-    override fun provide(baseUrl: String, widgetId: String): MatrixWidgetSettings {
+    override fun provide(baseUrl: String, widgetId: String, encrypted: Boolean): MatrixWidgetSettings {
         val options = VirtualElementCallWidgetOptions(
             elementCallUrl = baseUrl,
             widgetId = widgetId,
@@ -40,7 +40,7 @@ class DefaultCallWidgetSettingsProvider @Inject constructor() : CallWidgetSettin
             confineToRoom = true,
             font = null,
             analyticsId = null,
-            encryption = EncryptionSystem.PerParticipantKeys,
+            encryption = if (encrypted) EncryptionSystem.PerParticipantKeys else EncryptionSystem.Unencrypted,
         )
         val rustWidgetSettings = newVirtualElementCallWidget(options)
         return MatrixWidgetSettings.fromRustWidgetSettings(rustWidgetSettings)

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt

@@ -24,7 +24,7 @@ class FakeCallWidgetSettingsProvider(
 ) : CallWidgetSettingsProvider {
     val providedBaseUrls = mutableListOf<String>()
 
-    override fun provide(baseUrl: String, widgetId: String): MatrixWidgetSettings {
+    override fun provide(baseUrl: String, widgetId: String, encrypted: Boolean): MatrixWidgetSettings {
         providedBaseUrls += baseUrl
         return provideFn(baseUrl, widgetId)
     }