MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-12 18:57:36 +01:00
Code Releases Wiki Activity

Do not display paired devices that were not added to Gadgetbridge or have been deleted from Gadgetbridge

Browse Source 
Closes #1360
This commit is contained in:
Andreas Shimokawa 2018-12-09 20:03:15 +01:00
parent 29a5878d22
commit 198b7cc9c6
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -48,7 +48,7 @@ Please see [FEATURES.md](https://github.com/Freeyourgadget/Gadgetbridge/blob/mas
## Getting Started (Pebble) ## Getting Started (Pebble)
1. Pair your Pebble through the Android's Bluetooth Settings or Gadgetbridge. Pebble 2 MUST be paired though Gadgetbridge (tap on the + in Control Center) 1. Pair your Pebble through Gadgetbridge (tap on the + in Control Center)
2. Start Gadgetbridge, tap on the device you want to connect to 2. Start Gadgetbridge, tap on the device you want to connect to
3. To test, choose "Debug" from the menu and play around 3. To test, choose "Debug" from the menu and play around

28
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
View File

@ -132,12 +132,7 @@ public class DeviceHelper {
GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN); GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN);
} }
List<GBDevice> dbDevices = getDatabaseDevices(); List<GBDevice> dbDevices = getDatabaseDevices();
// these come first, as they have the most information already
availableDevices.addAll(dbDevices); availableDevices.addAll(dbDevices);
if (btAdapter != null) {
List<GBDevice> bondedDevices = getBondedDevices(btAdapter);
availableDevices.addAll(bondedDevices);
}
Prefs prefs = GBApplication.getPrefs(); Prefs prefs = GBApplication.getPrefs();
String miAddr = prefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, ""); String miAddr = prefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, "");
@ -264,29 +259,6 @@ public class DeviceHelper {
return gbDevice; return gbDevice;
} }
private @NonNull List<GBDevice> getBondedDevices(@NonNull BluetoothAdapter btAdapter) {
Set<BluetoothDevice> pairedDevices = btAdapter.getBondedDevices();
if (pairedDevices == null) {
return Collections.emptyList();
}
List<GBDevice> result = new ArrayList<>(pairedDevices.size());
DeviceHelper deviceHelper = DeviceHelper.getInstance();
for (BluetoothDevice pairedDevice : pairedDevices) {
if (pairedDevice == null) {
continue; // just to be safe, see https://github.com/Freeyourgadget/Gadgetbridge/pull/1052
}
if (pairedDevice.getName() != null && (pairedDevice.getName().startsWith("Pebble-LE ") || pairedDevice.getName().startsWith("Pebble Time LE "))) {
continue; // ignore LE Pebble (this is part of the main device now (volatileAddress)
}
GBDevice device = deviceHelper.toSupportedDevice(pairedDevice);
if (device != null) {
result.add(device);
}
}
return result;
}
/** /**
* Attempts to removing the bonding with the given device. Returns true * Attempts to removing the bonding with the given device. Returns true
* if bonding was supposedly successful and false if anything went wrong * if bonding was supposedly successful and false if anything went wrong