From 3f2fb12b3876d4248a600ecb8e598a7d5d9c8115 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 17 Jun 2021 10:16:33 +0200
Subject: [PATCH] Fixed audio device settings

---
 .../viewmodels/AudioSettingsViewModel.kt      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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 cc54b5eca..3b99f0541 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
@@ -28,6 +28,7 @@ import org.linphone.core.AudioDevice
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
 import org.linphone.core.EcCalibratorStatus
+import org.linphone.core.tools.Log
 import org.linphone.utils.Event
 import org.linphone.utils.PermissionHelper
 
@@ -207,33 +208,41 @@ class AudioSettingsViewModel : GenericSettingsViewModel() {
     private fun initInputAudioDevicesList() {
         val labels = arrayListOf<String>()
         val values = arrayListOf<AudioDevice>()
+        var index = 0
+        val default = core.defaultInputAudioDevice
+
         for (audioDevice in core.extendedAudioDevices) {
             if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) {
                 labels.add(audioDevice.id)
                 values.add(audioDevice)
+                if (audioDevice.id == default.id) {
+                    inputAudioDeviceIndex.value = index
+                }
+                index += 1
             }
         }
         inputAudioDeviceLabels.value = labels
         inputAudioDeviceValues.value = values
-
-        val default = core.defaultInputAudioDevice
-        inputAudioDeviceIndex.value = values.indexOf(default)
     }
 
     private fun initOutputAudioDevicesList() {
         val labels = arrayListOf<String>()
         val values = arrayListOf<AudioDevice>()
+        var index = 0
+        val default = core.defaultOutputAudioDevice
+
         for (audioDevice in core.extendedAudioDevices) {
             if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
                 labels.add(audioDevice.id)
                 values.add(audioDevice)
+                if (audioDevice.id == default.id) {
+                    outputAudioDeviceIndex.value = index
+                }
+                index += 1
             }
         }
         outputAudioDeviceLabels.value = labels
         outputAudioDeviceValues.value = values
-
-        val default = core.defaultOutputAudioDevice
-        outputAudioDeviceIndex.value = values.indexOf(default)
     }
 
     private fun initCodecBitrateList() {