mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-18 19:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: optimize Bluetooth enabled state handling

Browse Source
This commit is contained in:
andrekir
2024-01-03 08:31:36 -03:00
parent f5dff210b0
commit b792217f2b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepository.kt
View File

@@ -96,17 +96,13 @@ class BluetoothRepository @Inject constructor(
@SuppressLint("MissingPermission")
internal suspend fun updateBluetoothState() {
val newState: BluetoothState = bluetoothAdapterLazy.get()?.takeIf {
application.hasBluetoothPermission().also { hasPerms ->
if (!hasPerms) errormsg("Still missing needed bluetooth permissions")
}
}?.let { adapter ->
/// ask the adapter if we have access
val hasPerms = application.hasBluetoothPermission()
val newState: BluetoothState = bluetoothAdapterLazy.get()?.let { adapter ->
val enabled = adapter.isEnabled
val bondedDevices = adapter.bondedDevices ?: emptySet()
val bondedDevices = adapter.takeIf { hasPerms }?.bondedDevices ?: emptySet()
BluetoothState(
hasPermissions = true,
hasPermissions = hasPerms,
enabled = enabled,
bondedDevices = if (!enabled) emptyList()
else bondedDevices.filter { it.name?.matches(Regex(BLE_NAME_PATTERN)) == true },