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

Merge branch 'master' into feature-weather

here
Andreas Shimokawa 2016-12-25 23:20:09 +01:00
parent 6c5b51cd6d 4925dec9f6
commit e8d4575261
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
###Changelog
####Version 0.16.0
* New device: ZeBand
* ZeBand: Initial experimental support
* Pebble 2: Fix Pebble Classic FW 3.x app variant being priorized over native Pebble 2 app variant
####Version 0.15.2
* Mi Band: Fix crash with unknown notification sources

4
app/build.gradle
View File

@ -26,8 +26,8 @@ android {
targetSdkVersion 23
// note: always bump BOTH versionCode and versionName!
versionName "0.15.2"
versionCode 79
versionName "0.16.0"
versionCode 80
}
buildTypes {
release {

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
View File

@ -124,10 +124,12 @@ public class PBWReader {
ZipInputStream zis = new ZipInputStream(afin);
ZipEntry ze;
boolean found = false;
try {
while ((ze = zis.getNextEntry()) != null) {
if (ze.getName().startsWith(dir)) {
platformDir = dir;
found = true;
break;
}
}
@ -135,6 +137,9 @@ public class PBWReader {
} catch (IOException e) {
e.printStackTrace();
}
if (found) {
break;
}
}
if (platform.equals("chalk") && platformDir.equals("")) {

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

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
<release version="0.16.0" versioncode="80">
<change>New device: ZeBand</change>
<change>ZeBand: Initial experimental support</change>
<change>Pebble 2: Fix Pebble Classic FW 3.x app variant being priorized over native Pebble 2 app variant</change>
</release>
<release version="0.15.2" versioncode="79">
<change>Mi Band: Fix crash with unknown notification sources</change>
</release>