Add default bluetooth device name (#23)

* Add default bluetooth device name if null is returned from the Android BluetoothDevice class

* Update changelog

* Change constant name with default prefix

Author: John Qualls

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 0.1.3
+
+Bug Fixes
+
+- Fixed crash by adding a default bluetooth device name.
+
 ### 0.1.2
 
 Enhancements

audioswitch/src/main/java/com/twilio/audioswitch/android/BluetoothDeviceWrapperImpl.kt

@@ -2,8 +2,10 @@ package com.twilio.audioswitch.android
 
 import android.bluetooth.BluetoothDevice
 
+internal const val DEFAULT_DEVICE_NAME = "Bluetooth"
+
 internal class BluetoothDeviceWrapperImpl(
     private val device: BluetoothDevice,
-    override val name: String = device.name,
+    override val name: String = device.name ?: DEFAULT_DEVICE_NAME,
     override val deviceClass: Int? = device.bluetoothClass?.deviceClass
 ) : BluetoothDeviceWrapper

audioswitch/src/test/java/com/twilio/audioswitch/selection/AudioDeviceSelectorTest.kt

@@ -16,10 +16,12 @@ import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import com.nhaarman.mockitokotlin2.whenever
 import com.twilio.audioswitch.android.BluetoothDeviceWrapper
+import com.twilio.audioswitch.android.BluetoothDeviceWrapperImpl
 import com.twilio.audioswitch.selection.AudioDeviceSelector.State.ACTIVATED
 import com.twilio.audioswitch.selection.AudioDeviceSelector.State.STARTED
 import com.twilio.audioswitch.selection.AudioDeviceSelector.State.STOPPED
 import com.twilio.audioswitch.android.BuildWrapper
+import com.twilio.audioswitch.android.DEFAULT_DEVICE_NAME
 import com.twilio.audioswitch.android.LogWrapper
 import com.twilio.audioswitch.bluetooth.BluetoothController
 import com.twilio.audioswitch.bluetooth.BluetoothControllerAssertions
@@ -76,6 +78,18 @@ class AudioDeviceSelectorTest {
     )
     private val bluetoothControllerAssertions = BluetoothControllerAssertions()
 
+    @Test
+    fun `availableAudioDevices should return a generic bluetooth device name if none was returned from the BluetoothDevice class`() {
+        audioDeviceSelector.start(audioDeviceChangeListener)
+        audioDeviceSelector.bluetoothDeviceConnectionListener.onBluetoothConnected(
+                BluetoothDeviceWrapperImpl(mock()))
+
+        val hasDefaultDeviceName = audioDeviceSelector.availableAudioDevices.any {
+            it.name == DEFAULT_DEVICE_NAME
+        }
+        assertThat(hasDefaultDeviceName, equalTo(true))
+    }
+
     @Test
     fun `start should start the bluetooth and wired headset listeners`() {
         audioDeviceSelector.start(audioDeviceChangeListener)