MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-25 03:16:51 +01:00
Code Releases Wiki Activity

Pebble: fix of pairing issue with Pebble 2

Browse Source
This commit is contained in:
Aleksandr Ivanov 2024-01-28 22:52:56 +03:00 committed by Andreas Shimokawa
parent 983b7352cb
commit 2c316bfe9d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
View File

@ -100,7 +100,7 @@ public class BondingUtil {
case BluetoothDevice.BOND_BONDED: { case BluetoothDevice.BOND_BONDED: {
LOG.info("Bonded with " + device.getAddress()); LOG.info("Bonded with " + device.getAddress());
//noinspection StatementWithEmptyBody //noinspection StatementWithEmptyBody
if (isLePebble(device) || !bondingInterface.getAttemptToConnect()) { if (isLePebble(device) || isPebble2(device) || !bondingInterface.getAttemptToConnect()) {
// Do not initiate connection to LE Pebble and some others! // Do not initiate connection to LE Pebble and some others!
} else { } else {
attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice()); attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
@ -293,6 +293,15 @@ public class BondingUtil {
(device.getName().startsWith("Pebble-LE ") || device.getName().startsWith("Pebble Time LE ")); (device.getName().startsWith("Pebble-LE ") || device.getName().startsWith("Pebble Time LE "));
} }
/**
* Checks if device is Pebble 2
*/
public static boolean isPebble2(BluetoothDevice device) {
return device.getType() == BluetoothDevice.DEVICE_TYPE_LE &&
device.getName().startsWith("Pebble ") &&
!device.getName().startsWith("Pebble Time LE ");
}
/** /**
* Uses the CompanionDeviceManager bonding method * Uses the CompanionDeviceManager bonding method
*/ */
@ -379,9 +388,15 @@ public class BondingUtil {
GB.toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.pairing_creating_bond_with, device.getName(), device.getAddress()), Toast.LENGTH_LONG, GB.INFO); GB.toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.pairing_creating_bond_with, device.getName(), device.getAddress()), Toast.LENGTH_LONG, GB.INFO);
toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.discovery_attempting_to_pair, macAddress), Toast.LENGTH_SHORT, GB.INFO); toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.discovery_attempting_to_pair, macAddress), Toast.LENGTH_SHORT, GB.INFO);
if (GBApplication.getPrefs().getBoolean("enable_companiondevice_pairing", true) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { boolean companionPairingEnabled = GBApplication.getPrefs().getBoolean("enable_companiondevice_pairing", true) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
if (companionPairingEnabled && !isPebble2(device)) {
companionDeviceManagerBond(bondingInterface, device, macAddress); companionDeviceManagerBond(bondingInterface, device, macAddress);
} else if (isPebble2(device)) {
// TODO: start companionDevicePairing after connecting to Pebble 2 but before writing to pairing trigger
attemptToFirstConnect(device);
} else { } else {
bluetoothBond(bondingInterface, device); bluetoothBond(bondingInterface, device);
} }