AHOYAPPS-653: Add additional device classes to support more bluetooth headset devices (#20)

* Add additional device classes to support more bluetooth headset devices

* Update changelog with bug fix

Author: John Qualls

CHANGELOG.md

@@ -6,6 +6,10 @@ Enhancements
 
 - Added the library source to release artifacts. The sources will now be available when jumping to a library class definition in Android Studio.
 
+Bug Fixes
+
+- Added a fix for certain valid bluetooth device classes not being considered as headset devices as reported in [issue #16](https://github.com/twilio/audioswitch/issues/16).
+
 ### 0.1.1
 
 - Fixes bug that did not correctly abandon audio request after deactivate

audioswitch/src/main/java/com/twilio/audioswitch/bluetooth/BluetoothHeadsetReceiver.kt

@@ -2,7 +2,9 @@ package com.twilio.audioswitch.bluetooth
 
 import android.bluetooth.BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO
 import android.bluetooth.BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE
+import android.bluetooth.BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES
 import android.bluetooth.BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET
+import android.bluetooth.BluetoothClass.Device.Major.UNCATEGORIZED
 import android.bluetooth.BluetoothDevice.ACTION_ACL_CONNECTED
 import android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECTED
 import android.content.BroadcastReceiver
@@ -83,6 +85,8 @@ internal class BluetoothHeadsetReceiver(
             deviceWrapper.deviceClass?.let { deviceClass ->
                 deviceClass == AUDIO_VIDEO_HANDSFREE ||
                 deviceClass == AUDIO_VIDEO_WEARABLE_HEADSET ||
-                deviceClass == AUDIO_VIDEO_CAR_AUDIO
+                deviceClass == AUDIO_VIDEO_CAR_AUDIO ||
+                deviceClass == AUDIO_VIDEO_HEADPHONES ||
+                deviceClass == UNCATEGORIZED
             } ?: false
 }

audioswitch/src/test/java/com/twilio/audioswitch/bluetooth/BluetoothHeadsetReceiverTest.kt

@@ -50,13 +50,21 @@ class BluetoothHeadsetReceiverTest {
         val audioVideoCarDevice = mock<BluetoothClass> {
             whenever(mock.deviceClass).thenReturn(BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO)
         }
+        val headphonesDevice = mock<BluetoothClass> {
+            whenever(mock.deviceClass).thenReturn(BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES)
+        }
+        val uncategorizedDevice = mock<BluetoothClass> {
+            whenever(mock.deviceClass).thenReturn(BluetoothClass.Device.Major.UNCATEGORIZED)
+        }
         val wrongDevice = mock<BluetoothClass> {
             whenever(mock.deviceClass).thenReturn(BluetoothClass.Device.AUDIO_VIDEO_VIDEO_MONITOR)
         }
         return arrayOf(
             arrayOf(handsFreeDevice, true),
             arrayOf(audioVideoHeadsetDevice, true),
             arrayOf(audioVideoCarDevice, true),
+            arrayOf(headphonesDevice, true),
+            arrayOf(uncategorizedDevice, true),
             arrayOf(wrongDevice, false),
             arrayOf(null, false)
         )