mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into db-refactoring

master
cpfeiffer 2016-04-09 19:19:42 +02:00
parent 22a5aef7d7 57ecba16f3
commit 5ea107b439
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,9 +1,14 @@
###Changelog
####Version (next)
####Version (0.9.4)
* Pebble: support pebble health datalog messages of firmware 3.11 (this adds support for deep sleep!)
* Pebble: try to reconnect on new notifications and phone calls when connection was lost unexpectedly
* Pebble: delay between reconnection attempts (from 1 up to 64 seconds)
* Fix crash in charts activities when changing the date, quickly (#277)
* Mi Band: preference to enable heart rate measurement during sleep (#232, thanks computerlyrik!)
* Mi Band: display measured heart rate in charts (#232)
* Mi Band 1S: full support for firmware upgrade/downgrade (both for Mi Band and heart rate sensor) (#234)
* Mi Band 1S: fix device detection for certain versions
####Version 0.9.3
* Pebble: Fix Pebble Health activation (was not available in the App Manager)

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
View File

@ -157,12 +157,13 @@ public final class BtLEQueue {
LOG.info("Attempting to connect to " + mGbDevice.getName());
mBluetoothAdapter.cancelDiscovery();
BluetoothDevice remoteDevice = mBluetoothAdapter.getRemoteDevice(mGbDevice.getAddress());
boolean result;
// boolean result;
synchronized (mGattMonitor) {
mBluetoothGatt = remoteDevice.connectGatt(mContext, true, internalGattCallback);
result = mBluetoothGatt.connect();
// connectGatt with true doesn't really work ;( too often connection problems
mBluetoothGatt = remoteDevice.connectGatt(mContext, false, internalGattCallback);
// result = mBluetoothGatt.connect();
}
// boolean result = mBluetoothGatt != null;
boolean result = mBluetoothGatt != null;
if (result) {
setDeviceConnectionState(State.CONNECTING);
}

5
app/src/main/res/xml/changelog_master.xml
View File

@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
<release version="0.9.4" versioncode="48">
<change>Fix crash in charts activities when changing the date, quickly (#277)</change>
<change>Pebble: support pebble health datalog messages of firmware 3.11 (this adds support for deep sleep!)</change>
<change>Pebble: try to reconnect on new notifications and phone calls when connection was lost unexpectedly</change>
<change>Pebble: delay between reconnection attempts (from 1 up to 64 seconds)</change>
<change>Mi Band: preference to enable heart rate measurement during sleep (#232, thanks computerlyrik!)</change>
<change>Mi Band: display measured heart rate in charts (#232)</change>
<change>Mi Band 1S: full support for firmware upgrade/downgrade (both for Mi Band and heart rate sensor) (#234)</change>
<change>Mi Band 1S: fix device detection for certain versions</change>
</release>
<release version="0.9.3" versioncode="47">
<change>Pebble: Fix Pebble Health activation (was not available in the App Manager)</change>