Merge pull request #146 from getditto/rr/health-bluetooth-fix

rajramsaroop · web-flow · commit 5623c46b632b · 2025-01-27T11:16:30.000-05:00
fix NPE that occurs on emulators without bluetooth, update tools version
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthScreenActionHandler.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthScreenActionHandler.kt
@@ -7,7 +7,10 @@ import android.provider.Settings
 
 class HealthScreenActionHandler {
     fun handle(actionType: HealthUiActionType, context: Context) = when (actionType) {
-        HealthUiActionType.NoAction -> {}
+        HealthUiActionType.NoAction,
+        HealthUiActionType.BluetoothUnsupported -> {
+        }
+
         HealthUiActionType.EnableWifi -> {
             context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
         }
@@ -23,5 +26,6 @@ class HealthScreenActionHandler {
         HealthUiActionType.EnableBluetooth -> {
             context.startActivity(Intent(Settings.ACTION_BLUETOOTH_SETTINGS))
         }
+
     }
 }
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthUiActionType.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthUiActionType.kt
@@ -5,4 +5,5 @@ sealed class HealthUiActionType {
     object RequestPermissions : HealthUiActionType()
     object EnableWifi : HealthUiActionType()
     object EnableBluetooth : HealthUiActionType()
+    object BluetoothUnsupported : HealthUiActionType()
 }
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthUiStateCause.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/HealthUiStateCause.kt
@@ -16,6 +16,7 @@ data class HealthUiStateCause(
             HealthUiActionType.EnableWifi -> false
             HealthUiActionType.RequestPermissions -> false
             HealthUiActionType.EnableBluetooth -> false
+            HealthUiActionType.BluetoothUnsupported -> false
         }
     }
 
@@ -24,5 +25,6 @@ data class HealthUiStateCause(
         HealthUiActionType.EnableWifi -> context.getString(R.string.enable_wifi)
         HealthUiActionType.RequestPermissions -> context.getString(R.string.request_permissions)
         HealthUiActionType.EnableBluetooth -> context.getString(R.string.enable_bluetooth)
+        HealthUiActionType.BluetoothUnsupported -> ""
     }
 }
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/data/HealthUiState.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/data/HealthUiState.kt
@@ -8,12 +8,13 @@ import live.ditto.tools.R
 import live.ditto.tools.health.usecase.WifiAwareState
 import live.ditto.tools.health.HealthUiActionType
 import live.ditto.tools.health.HealthUiStateCause
+import live.ditto.tools.health.usecase.BluetoothState
 
 data class HealthUiState(
     val defaultDispatcher: CoroutineDispatcher = Dispatchers.Default,
     val missingPermissions: List<String> = emptyList(),
     val wifiEnabled: Boolean = true,
-    val bluetoothEnabled: Boolean = true,
+    val bluetoothState: BluetoothState = BluetoothState.UNSUPPORTED,
     val wifiAwareState: WifiAwareState = WifiAwareState.UNSUPPORTED,
     val deviceDetails: DeviceDetails
 ) {
@@ -81,22 +82,36 @@ data class HealthUiState(
         withActions: MutableList<HealthUiStateCause>,
         context: Context
     ) {
-        if (bluetoothEnabled) {
-            noActions.add(
-                HealthUiStateCause(
-                    reason = context.getString(R.string.bluetooth_status),
-                    details = listOf(context.getString(R.string.bluetooth_enabled)),
-                    actionType = HealthUiActionType.NoAction
+        when (bluetoothState) {
+            BluetoothState.ENABLED -> {
+                noActions.add(
+                    HealthUiStateCause(
+                        reason = context.getString(R.string.bluetooth_status),
+                        details = listOf(context.getString(R.string.bluetooth_enabled)),
+                        actionType = HealthUiActionType.NoAction
+                    )
                 )
-            )
-        } else {
-            withActions.add(
-                HealthUiStateCause(
-                    reason = context.getString(R.string.bluetooth_status),
-                    details = listOf(context.getString(R.string.bluetooth_not_enabled)),
-                    actionType = HealthUiActionType.EnableBluetooth
+            }
+
+            BluetoothState.DISABLED -> {
+                withActions.add(
+                    HealthUiStateCause(
+                        reason = context.getString(R.string.bluetooth_status),
+                        details = listOf(context.getString(R.string.bluetooth_not_enabled)),
+                        actionType = HealthUiActionType.EnableBluetooth
+                    )
                 )
-            )
+            }
+
+            BluetoothState.UNSUPPORTED -> {
+                noActions.add(
+                    HealthUiStateCause(
+                        reason = context.getString(R.string.bluetooth_status),
+                        details = listOf(context.getString(R.string.bluetooth_unsupported)),
+                        actionType = HealthUiActionType.BluetoothUnsupported
+                    )
+                )
+            }
         }
     }
 }
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/composables/HealthScreen.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/composables/HealthScreen.kt
@@ -3,6 +3,8 @@ package live.ditto.tools.health.ui.composables
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -14,7 +16,8 @@ fun HealthScreen(
 ) {
     Column(
         modifier = modifier
-            .padding(8.dp),
+            .padding(8.dp)
+            .verticalScroll(state = rememberScrollState()),
         verticalArrangement = Arrangement.spacedBy(16.dp)
     ) {
         displayList.forEach { screen ->
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/composables/TransportHealthInformation.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/composables/TransportHealthInformation.kt
@@ -68,7 +68,7 @@ private fun TransportHealthInformation(
             healthUiStateCauses.forEach { healthUiStateCause ->
                 val actionType = healthUiStateCause.actionType
 
-                if (actionType == HealthUiActionType.NoAction) {
+                if (actionType == HealthUiActionType.NoAction || actionType == HealthUiActionType.BluetoothUnsupported) {
                     HealthCheckWithNoAction(
                         header = healthUiStateCause.reason,
                         isHealthy = healthUiStateCause.isHealthy,
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/viewmodel/HealthViewModel.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/ui/viewmodel/HealthViewModel.kt
@@ -18,6 +18,7 @@ import live.ditto.tools.health.usecase.GetWifiAwareStatusUseCase
 import live.ditto.tools.health.usecase.GetWifiStatusFlow
 import live.ditto.tools.health.data.DeviceDetails
 import live.ditto.tools.health.data.HealthUiState
+import live.ditto.tools.health.usecase.BluetoothState
 import live.ditto.tools.health.usecase.GetPermissionsMetricsUseCase
 import live.ditto.tools.healthmetrics.HealthMetric
 import live.ditto.tools.healthmetrics.HealthMetricProvider
@@ -110,9 +111,9 @@ class HealthViewModel(
         }
     }
 
-    private fun onBluetoothStatus(status: Boolean) {
+    private fun onBluetoothStatus(bluetoothState: BluetoothState) {
         _state.update {
-            it.copy(bluetoothEnabled = status)
+            it.copy(bluetoothState = bluetoothState)
         }
     }
 
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/usecase/GetBluetoothStatusFlow.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/usecase/GetBluetoothStatusFlow.kt
@@ -18,18 +18,44 @@ class GetBluetoothStatusFlow(context: Context) {
     private val state = callbackFlow {
         val receiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
-                launch { send(bluetoothManager.adapter.isEnabled) }
+                launch { send(determineBluetoothState(bluetoothManager = bluetoothManager)) }
             }
         }
 
         context.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED))
 
-        send(bluetoothManager.adapter.isEnabled)
+        if (bluetoothManager.adapter == null) {
+            send(BluetoothState.UNSUPPORTED)
+        } else {
+            if (bluetoothManager.adapter.isEnabled) {
+                send(BluetoothState.ENABLED)
+            } else {
+                send(BluetoothState.DISABLED)
+            }
+        }
 
         awaitClose {
             context.unregisterReceiver(receiver)
         }
     }
 
     operator fun invoke() = state
+
+    private fun determineBluetoothState(bluetoothManager: BluetoothManager): BluetoothState {
+        return if (bluetoothManager.adapter == null) {
+            BluetoothState.UNSUPPORTED
+        } else {
+            if (bluetoothManager.adapter.isEnabled) {
+                BluetoothState.ENABLED
+            } else {
+                BluetoothState.DISABLED
+            }
+        }
+    }
+}
+
+enum class BluetoothState {
+    ENABLED,
+    DISABLED,
+    UNSUPPORTED
 }
diff --git a/DittoToolsAndroid/src/main/java/live/ditto/tools/health/usecase/GetPermissionsMetricsUseCase.kt b/DittoToolsAndroid/src/main/java/live/ditto/tools/health/usecase/GetPermissionsMetricsUseCase.kt
@@ -9,15 +9,19 @@ class GetPermissionsMetricsUseCase {
     operator fun invoke(healthUiState: HealthUiState): HealthMetric {
         val missingPermissions = healthUiState.missingPermissions
         val wifiEnabled = healthUiState.wifiEnabled
-        val bluetoothEnabled = healthUiState.bluetoothEnabled
+        val bluetoothState = healthUiState.bluetoothState
         val wifiAwareState = healthUiState.wifiAwareState
 
-        val isHealthy = missingPermissions.isEmpty() && wifiEnabled && bluetoothEnabled
+        val isHealthy by lazy {
+            missingPermissions.isEmpty()
+                    && wifiEnabled
+                    && bluetoothState == BluetoothState.ENABLED
+        }
 
         val details = createDetailsMap(
             missingPermissions = missingPermissions,
             wifiEnabled = wifiEnabled,
-            bluetoothEnabled = bluetoothEnabled,
+            bluetoothState = bluetoothState,
             wifiAwareState = wifiAwareState
         )
 
@@ -30,15 +34,15 @@ class GetPermissionsMetricsUseCase {
     private fun createDetailsMap(
         missingPermissions: List<String>,
         wifiEnabled: Boolean,
-        bluetoothEnabled: Boolean,
+        bluetoothState: BluetoothState,
         wifiAwareState: WifiAwareState
     ): MutableMap<String, String> {
         return mutableMapOf<String, String>().apply {
             if (missingPermissions.isNotEmpty()) {
                 this[KEY_MISSING_PERMISSIONS] = missingPermissions.joinToString()
             }
             this[KEY_WIFI_ENABLED] = wifiEnabled.toString()
-            this[KEY_BLUETOOTH_ENABLED] = bluetoothEnabled.toString()
+            this[KEY_BLUETOOTH_STATE] = getBluetoothStateDescription(bluetoothState)
             this[KEY_WIFI_AWARE_STATE] = getWifiAwareStateDescription(wifiAwareState)
         }
     }
@@ -51,10 +55,18 @@ class GetPermissionsMetricsUseCase {
         }
     }
 
+    private fun getBluetoothStateDescription(bluetoothState: BluetoothState): String {
+        return when (bluetoothState) {
+            BluetoothState.ENABLED -> "Bluetooth is enabled"
+            BluetoothState.DISABLED -> "Bluetooth is disabled"
+            BluetoothState.UNSUPPORTED -> "Bluetooth is not supported by this device"
+        }
+    }
+
     companion object {
         const val KEY_MISSING_PERMISSIONS = "Missing Permissions"
         const val KEY_WIFI_ENABLED = "WiFi Enabled"
-        const val KEY_BLUETOOTH_ENABLED = "Bluetooth Enabled"
+        const val KEY_BLUETOOTH_STATE = "Bluetooth State"
         const val KEY_WIFI_AWARE_STATE = "Wifi Aware State"
     }
 }
diff --git a/DittoToolsAndroid/src/main/res/values/strings.xml b/DittoToolsAndroid/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="enable_wifi">Enable Wi-fi</string>
     <string name="request_permissions">Request Permissions</string>
     <string name="bluetooth_status">Bluetooth Status</string>
+    <string name="bluetooth_unsupported">Bluetooth Unsupported</string>
     <string name="bluetooth_enabled">Bluetooth Enabled</string>
     <string name="bluetooth_not_enabled">Bluetooth Not Enabled</string>
     <string name="enable_bluetooth">Enable Bluetooth</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ androidx-test-ext = "1.1.5"
 androidx-webkit = "1.7.0"
 datastorePreferences = "1.0.0"
 ditto = "4.8.2"
-live-ditto-tools = "3.0.0"
+live-ditto-tools = "3.0.1"
 
 junit = "4.13.2"
 kotlin-gradle-plugin = "1.8.10"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@ import android.provider.Settings`
`7`	`7`
`8`	`8`	`class HealthScreenActionHandler {`
`9`	`9`	`fun handle(actionType: HealthUiActionType, context: Context) = when (actionType) {`
`10`		`- HealthUiActionType.NoAction -> {}`
	`10`	`+ HealthUiActionType.NoAction,`
	`11`	`+ HealthUiActionType.BluetoothUnsupported -> {`
	`12`	`+ }`
	`13`	`+`
`11`	`14`	`HealthUiActionType.EnableWifi -> {`
`12`	`15`	`context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))`
`13`	`16`	`}`
`@@ -23,5 +26,6 @@ class HealthScreenActionHandler {`
`23`	`26`	`HealthUiActionType.EnableBluetooth -> {`
`24`	`27`	`context.startActivity(Intent(Settings.ACTION_BLUETOOTH_SETTINGS))`
`25`	`28`	`}`
	`29`	`+`
`26`	`30`	`}`
`27`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ sealed class HealthUiActionType {`
`5`	`5`	`object RequestPermissions : HealthUiActionType()`
`6`	`6`	`object EnableWifi : HealthUiActionType()`
`7`	`7`	`object EnableBluetooth : HealthUiActionType()`
	`8`	`+ object BluetoothUnsupported : HealthUiActionType()`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ data class HealthUiStateCause(`
`16`	`16`	`HealthUiActionType.EnableWifi -> false`
`17`	`17`	`HealthUiActionType.RequestPermissions -> false`
`18`	`18`	`HealthUiActionType.EnableBluetooth -> false`
	`19`	`+ HealthUiActionType.BluetoothUnsupported -> false`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
`@@ -24,5 +25,6 @@ data class HealthUiStateCause(`
`24`	`25`	`HealthUiActionType.EnableWifi -> context.getString(R.string.enable_wifi)`
`25`	`26`	`HealthUiActionType.RequestPermissions -> context.getString(R.string.request_permissions)`
`26`	`27`	`HealthUiActionType.EnableBluetooth -> context.getString(R.string.enable_bluetooth)`
	`28`	`+ HealthUiActionType.BluetoothUnsupported -> ""`
`27`	`29`	`}`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import live.ditto.tools.health.usecase.GetWifiAwareStatusUseCase`
`18`	`18`	`import live.ditto.tools.health.usecase.GetWifiStatusFlow`
`19`	`19`	`import live.ditto.tools.health.data.DeviceDetails`
`20`	`20`	`import live.ditto.tools.health.data.HealthUiState`
	`21`	`+import live.ditto.tools.health.usecase.BluetoothState`
`21`	`22`	`import live.ditto.tools.health.usecase.GetPermissionsMetricsUseCase`
`22`	`23`	`import live.ditto.tools.healthmetrics.HealthMetric`
`23`	`24`	`import live.ditto.tools.healthmetrics.HealthMetricProvider`
`@@ -110,9 +111,9 @@ class HealthViewModel(`
`110`	`111`	`}`
`111`	`112`	`}`
`112`	`113`
`113`		`- private fun onBluetoothStatus(status: Boolean) {`
	`114`	`+ private fun onBluetoothStatus(bluetoothState: BluetoothState) {`
`114`	`115`	`_state.update {`
`115`		`- it.copy(bluetoothEnabled = status)`
	`116`	`+ it.copy(bluetoothState = bluetoothState)`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`