demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

ble: use correct type of DeviceFilter for CompanionDeviceManager.associate

Browse Source 
Use BluetoothDeviceFilter or BluetoothLeDeviceFilter instead of always BluetoothDeviceFilter.
While this doesn't seem to impact the associate call itself it influences how/when CompanionDeviceService picks up the gadget on some devices.
This commit is contained in:
Thomas Kuehne
2025-06-16 21:33:59 +02:00
committed by José Rebelo
parent d439d09b98
commit 91ae4bffd2
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
+34 -5
View File
@@ -27,10 +27,14 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothManager;
import android.bluetooth.le.ScanFilter;
import android.bluetooth.le.ScanResult;
import android.companion.AssociationInfo; import android.companion.AssociationInfo;
import android.companion.AssociationRequest; import android.companion.AssociationRequest;
import android.companion.BluetoothDeviceFilter; import android.companion.BluetoothDeviceFilter;
import android.companion.BluetoothLeDeviceFilter;
import android.companion.CompanionDeviceManager; import android.companion.CompanionDeviceManager;
import android.companion.DeviceFilter;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -287,8 +291,16 @@ public class BondingUtil {
requestCode == BondingUtil.REQUEST_CODE && requestCode == BondingUtil.REQUEST_CODE &&
resultCode == Activity.RESULT_OK) { resultCode == Activity.RESULT_OK) {
BluetoothDevice deviceToPair = final BluetoothDevice deviceToPair;
data.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE); final Object extra = data.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE);
if (extra instanceof BluetoothDevice) {
deviceToPair = (BluetoothDevice) extra;
} else if (extra instanceof final ScanResult scanResult) {
deviceToPair = scanResult.getDevice();
} else {
LOG.error(" handleActivityResult unexpected EXTRA_DEVICE {}", extra);
deviceToPair = null;
}
if (deviceToPair != null) { if (deviceToPair != null) {
if (bondingInterface.getCurrentTarget().getDevice().getAddress().equals(deviceToPair.getAddress())) { if (bondingInterface.getCurrentTarget().getDevice().getAddress().equals(deviceToPair.getAddress())) {
@@ -328,9 +340,26 @@ public class BondingUtil {
private static void companionDeviceManagerBond(BondingInterface bondingInterface, private static void companionDeviceManagerBond(BondingInterface bondingInterface,
BluetoothDevice device) { BluetoothDevice device) {
final String macAddress = device.getAddress(); final String macAddress = device.getAddress();
BluetoothDeviceFilter deviceFilter = new BluetoothDeviceFilter.Builder() final int type = device.getType();
.setAddress(macAddress) final DeviceFilter<?> deviceFilter;
.build();
if (type == BluetoothDevice.DEVICE_TYPE_LE || type == BluetoothDevice.DEVICE_TYPE_DUAL) {
LOG.debug("companionDeviceManagerBond {} type {} - treat as LE",
macAddress, type);
ScanFilter scan = new ScanFilter.Builder()
.setDeviceAddress(macAddress)
.build();
deviceFilter = new BluetoothLeDeviceFilter.Builder()
.setScanFilter(scan)
.build();
} else {
LOG.debug("companionDeviceManagerBond {} type {} - treat as classic BT",
macAddress, type);
deviceFilter = new BluetoothDeviceFilter.Builder()
.setAddress(macAddress)
.build();
}
AssociationRequest pairingRequest = new AssociationRequest.Builder() AssociationRequest pairingRequest = new AssociationRequest.Builder()
.addDeviceFilter(deviceFilter) .addDeviceFilter(deviceFilter)