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

Prevent crash when pairing with BondAction

Browse Source
This commit is contained in:
José Rebelo 2024-07-29 20:33:39 +01:00
parent 00d90f4b8b
commit 1c5e485bfe
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,9 +375,14 @@ public class BondingUtil {
return; return;
} }
// FIXME: We can only attempt companion pairing if the context of the bondingInterface is an activity
// however, when called from the BondAction it will always be the global Application context
// See https://codeberg.org/Freeyourgadget/Gadgetbridge/issues/3784#issuecomment-2121792
final boolean contextIsActivity = bondingInterface.getContext() instanceof Activity;
if (bondState == BluetoothDevice.BOND_BONDED) { if (bondState == BluetoothDevice.BOND_BONDED) {
GB.toast(bondingInterface.getContext().getString(R.string.pairing_already_bonded, device.getName(), device.getAddress()), Toast.LENGTH_SHORT, GB.INFO); GB.toast(bondingInterface.getContext().getString(R.string.pairing_already_bonded, device.getName(), device.getAddress()), Toast.LENGTH_SHORT, GB.INFO);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isPebble2(device)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isPebble2(device) && contextIsActivity) {
// If CompanionDeviceManager is available, skip connection and go bond // If CompanionDeviceManager is available, skip connection and go bond
// TODO: It would theoretically be nice to check if it's already been granted, // TODO: It would theoretically be nice to check if it's already been granted,
// but re-bond works // but re-bond works
@ -390,7 +395,7 @@ 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);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isPebble2(device)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isPebble2(device) && contextIsActivity) {
askCompanionPairing(bondingInterface, device, macAddress); askCompanionPairing(bondingInterface, device, macAddress);
} else if (isPebble2(device)) { } else if (isPebble2(device)) {
// TODO: start companionDevicePairing after connecting to Pebble 2 but before writing to pairing trigger // TODO: start companionDevicePairing after connecting to Pebble 2 but before writing to pairing trigger