diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt index 8c684ef7d..bc269e819 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt @@ -222,7 +222,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) { labels.add(audioDevice.id) values.add(audioDevice) - if (audioDevice.id == default.id) { + if (audioDevice.id == default?.id) { inputAudioDeviceIndex.value = index } index += 1 @@ -242,7 +242,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) { labels.add(audioDevice.id) values.add(audioDevice) - if (audioDevice.id == default.id) { + if (audioDevice.id == default?.id) { outputAudioDeviceIndex.value = index } index += 1 diff --git a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt b/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt index 70e776b52..3a0a60b59 100644 --- a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt +++ b/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt @@ -46,9 +46,9 @@ class AudioRouteUtils { else AudioDevice.Capabilities.CapabilityRecord val preferredDriver = if (output) { - coreContext.core.defaultOutputAudioDevice.driverName + coreContext.core.defaultOutputAudioDevice?.driverName } else { - coreContext.core.defaultInputAudioDevice.driverName + coreContext.core.defaultInputAudioDevice?.driverName } val extendedAudioDevices = coreContext.core.extendedAudioDevices