Race conditions in changing states (#147)

* Fix race conditions in changing states * Update CHANGELOG.md [skip ci]
twilio · Mar 20, 2023 · c6d9f3b · c6d9f3b
1 parent 961771c
commit c6d9f3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,12 @@
 # Changelog
 
-### 1.1.8 (Mar 6, 2023)
+### 1.1.8 (Mar 17, 2023)
 
 Bug Fixes
 
 - Fixed issue where some Samsung Galaxy devices (S9, S21) would not route audio through USB headset when MODE_IN_COMMUNICATION is set.
+- Fixed issue where IllegalStateException would be thrown when activating selected AudioDevice shortly after starting AudioSwitch.
+- Fixed issue where after stopping AudioSwitch while having an active Bluetooth device would result in permanent audio focus gain.
 
 ### 1.1.7 (Feb 21, 2023)
 

diff --git a/audioswitch/src/main/java/com/twilio/audioswitch/AudioSwitch.kt b/audioswitch/src/main/java/com/twilio/audioswitch/AudioSwitch.kt
@@ -157,10 +157,10 @@ class AudioSwitch {
         audioDeviceChangeListener = listener
         when (state) {
             STOPPED -> {
+                state = STARTED
                 enumerateDevices()
                 bluetoothHeadsetManager?.start(bluetoothDeviceConnectionListener)
                 wiredHeadsetReceiver.start(wiredDeviceConnectionListener)
-                state = STARTED
             }
             else -> {
                 logger.d(TAG, "Redundant start() invocation while already in the started or activated state")
@@ -197,13 +197,13 @@ class AudioSwitch {
     fun activate() {
         when (state) {
             STARTED -> {
+                state = ACTIVATED
                 audioDeviceManager.cacheAudioState()
 
                 // Always set mute to false for WebRTC
                 audioDeviceManager.mute(false)
                 audioDeviceManager.setAudioFocus()
                 selectedDevice?.let { activate(it) }
-                state = ACTIVATED
             }
             ACTIVATED -> selectedDevice?.let { activate(it) }
             STOPPED -> throw IllegalStateException()
@@ -217,11 +217,11 @@ class AudioSwitch {
     fun deactivate() {
         when (state) {
             ACTIVATED -> {
+                state = STARTED
                 bluetoothHeadsetManager?.deactivate()
 
                 // Restore stored audio state
                 audioDeviceManager.restoreAudioState()
-                state = STARTED
             }
             STARTED, STOPPED -> {
             }
@@ -358,10 +358,10 @@ class AudioSwitch {
             } ?: false
 
     private fun closeListeners() {
+        state = STOPPED
         bluetoothHeadsetManager?.stop()
         wiredHeadsetReceiver.stop()
         audioDeviceChangeListener = null
-        state = STOPPED
     }
 
     companion object {