Fix bug with autoselecting wired headset for calls.

cody-signal · cody-signal · commit 69fbd4f3fc8b · 2021-09-29T16:17:52.000-04:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt
@@ -208,13 +208,13 @@ class SignalAudioManager(private val context: Context, private val eventListener
       userSelectedAudioDevice = AudioDevice.NONE
     }
 
-    if (hasWiredHeadset && autoSwitchToWiredHeadset && userSelectedAudioDevice == AudioDevice.SPEAKER_PHONE) {
+    if (hasWiredHeadset && autoSwitchToWiredHeadset) {
       userSelectedAudioDevice = AudioDevice.WIRED_HEADSET
       autoSwitchToWiredHeadset = false
     }
 
     if (!hasWiredHeadset && userSelectedAudioDevice == AudioDevice.WIRED_HEADSET) {
-      userSelectedAudioDevice = AudioDevice.SPEAKER_PHONE
+      userSelectedAudioDevice = AudioDevice.NONE
     }
 
     val needBluetoothAudioStart = signalBluetoothManager.state == SignalBluetoothManager.State.AVAILABLE &&

Original file line number	Diff line number	Diff line change
`@@ -208,13 +208,13 @@ class SignalAudioManager(private val context: Context, private val eventListener`
`208`	`208`	`userSelectedAudioDevice = AudioDevice.NONE`
`209`	`209`	`}`
`210`	`210`
`211`		`- if (hasWiredHeadset && autoSwitchToWiredHeadset && userSelectedAudioDevice == AudioDevice.SPEAKER_PHONE) {`
	`211`	`+ if (hasWiredHeadset && autoSwitchToWiredHeadset) {`
`212`	`212`	`userSelectedAudioDevice = AudioDevice.WIRED_HEADSET`
`213`	`213`	`autoSwitchToWiredHeadset = false`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`if (!hasWiredHeadset && userSelectedAudioDevice == AudioDevice.WIRED_HEADSET) {`
`217`		`- userSelectedAudioDevice = AudioDevice.SPEAKER_PHONE`
	`217`	`+ userSelectedAudioDevice = AudioDevice.NONE`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`val needBluetoothAudioStart = signalBluetoothManager.state == SignalBluetoothManager.State.AVAILABLE &&`