Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Catch exceptions when setting or clearing an audio communication device in Element Call (#6226)

Browse source
This commit is contained in:
Jorge Martin Espinosa 2026-02-24 13:38:53 +01:00 • committed by GitHub
parent e528df274c
commit 28c1c078a0
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt
View file

@ -18,6 +18,7 @@ import android.webkit.JavascriptInterface
import android.webkit.WebView import android.webkit.WebView
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import io.element.android.libraries.core.extensions.runCatchingExceptions
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -385,10 +386,18 @@ class WebViewAudioManager(
currentDeviceId = device?.id currentDeviceId = device?.id
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
if (device != null) { if (device != null) {
Timber.d("Setting communication device: ${device.id} - ${deviceName(device.type, device.productName.toString())}") runCatchingExceptions {
setCommunicationDevice(device) Timber.d("Setting communication device: ${device.id} - ${deviceName(device.type, device.productName.toString())}")
setCommunicationDevice(device)
}.onFailure {
Timber.e(it, "Could not set communication device.")
}
} else { } else {
audioManager.clearCommunicationDevice() runCatchingExceptions {
clearCommunicationDevice()
}.onFailure {
Timber.e(it, "Could not clear communication device.")
}
} }
} else { } else {
// On Android 11 and lower, we don't have the concept of communication devices // On Android 11 and lower, we don't have the concept of communication devices