Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Actually check the paired state instead of assuming it for bluetooth connection sensor #2738

Merged
merged 5 commits into from
Aug 3, 2022
Merged

Actually check the paired state instead of assuming it for bluetooth connection sensor #2738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ac74b8
Actually check the paired state instead of assuming it
dshokouhi Jul 30, 2022
0416b51
Ensure the attributes have no duplicates by making the lists distinct
dshokouhi Jul 31, 2022
651c708
Actually check for duplicate devices to remove them
dshokouhi Jul 31, 2022
f2887b4
Apply code suggestion
dshokouhi Jul 31, 2022
c62c7c7
Revert some changes and remove allowDuplicates per comment
dshokouhi Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/io/homeassistant/companion/android/sensors/BluetoothSensorManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class BluetoothSensorManager : SensorManager {

if (checkPermission(context, bluetoothConnection.id)) {

val bluetoothDevices = BluetoothUtils.getBluetoothDevices(context, true)
val bluetoothDevices = BluetoothUtils.getBluetoothDevices(context)
pairedDevices = bluetoothDevices.filter { b -> b.paired }.map { checkNameAddress(it) }
connectedPairedDevices = bluetoothDevices.filter { b -> b.paired && b.connected }.map { checkNameAddress(it) }
connectedNotPairedDevices = bluetoothDevices.filter { b -> !b.paired && b.connected }.map { checkNameAddress(it) }
Expand Down
10 changes: 6 additions & 4 deletions common/src/main/java/io/homeassistant/companion/android/common/bluetooth/BluetoothUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package io.homeassistant.companion.android.common.bluetooth

import android.annotation.SuppressLint
import android.bluetooth.BluetoothManager
import android.bluetooth.BluetoothProfile
import android.content.Context
import androidx.core.content.getSystemService
import java.lang.reflect.Method

object BluetoothUtils {
fun getBluetoothDevices(context: Context, allowDuplicates: Boolean = false): List<BluetoothDevice> {
@SuppressLint("MissingPermission")
fun getBluetoothDevices(context: Context): List<BluetoothDevice> {
val devices: MutableList<BluetoothDevice> = ArrayList()

val bluetoothManager =
Expand All @@ -26,20 +28,20 @@ object BluetoothUtils {
BluetoothDevice(
btDev.address,
name,
true,
btDev.bondState == android.bluetooth.BluetoothDevice.BOND_BONDED,
isConnected(btDev)
)
)
}
val btConnectedDevices = bluetoothManager.getConnectedDevices(BluetoothProfile.GATT)
for (btDev in btConnectedDevices) {
if (!allowDuplicates && devices.any { it.address == btDev.address }) continue
if (devices.any { it.address == btDev.address }) continue
val name = btDev.name ?: btDev.address
devices.add(
BluetoothDevice(
btDev.address,
name,
false,
btDev.bondState == android.bluetooth.BluetoothDevice.BOND_BONDED,
isConnected(btDev)
)
)
Expand Down