nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enable UUID_PAIR again, when keeping data on device is configured) #250 

This should fix data sharing with Mi Fit
This commit is contained in:
cpfeiffer 2016-10-05 23:01:35 +02:00
parent e5d178b315
commit 713e9426b9
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
View File

@ -108,9 +108,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
enableNotifications(builder, true) enableNotifications(builder, true)
.setLowLatency(builder) .setLowLatency(builder)
.readDate(builder) // without reading the data, we get sporadic connection problems, especially directly after turning on BT .readDate(builder) // without reading the data, we get sporadic connection problems, especially directly after turning on BT
// this is apparently not needed anymore, and actually causes problems when bonding is not used/does not work .pair(builder)
// so we simply not use the UUID_PAIR characteristic.
// .pair(builder)
.requestDeviceInfo(builder) .requestDeviceInfo(builder)
.sendUserInfo(builder) .sendUserInfo(builder)
.checkAuthenticationNeeded(builder, getDevice()) .checkAuthenticationNeeded(builder, getDevice())
@ -320,12 +318,21 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
* @return * @return
*/ */
private MiBandSupport pair(TransactionBuilder transaction) { private MiBandSupport pair(TransactionBuilder transaction) {
LOG.info("Attempting to pair MI device..."); // this is apparently only needed to get a more strict bond between mobile and mi band,
BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandService.UUID_CHARACTERISTIC_PAIR); // e.g. such that Mi Fit and Gadgetbridge can coexist without needing to re-pair (with
if (characteristic != null) { // full device-data-reset).
transaction.write(characteristic, new byte[]{2}); // Unfortunately this extra pairing causes problems when bonding is not used/does not work
} else { // so we only do this when configured to keep data on the device
LOG.info("Unable to pair MI device -- characteristic not available");
Prefs prefs = GBApplication.getPrefs();
if (prefs.getBoolean(MiBandConst.PREF_MIBAND_DONT_ACK_TRANSFER, false)) {
LOG.info("Attempting to pair MI device...");
BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandService.UUID_CHARACTERISTIC_PAIR);
if (characteristic != null) {
transaction.write(characteristic, new byte[]{2});
} else {
LOG.info("Unable to pair MI device -- characteristic not available");
}
} }
return this; return this;
} }