MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-17 21:06:48 +01:00
Code Releases Wiki Activity

Merge branch 'master' into feature-weather

Browse Source
This commit is contained in:
Andreas Shimokawa 2016-12-25 23:20:09 +01:00
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 ###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 ####Version 0.15.2
* Mi Band: Fix crash with unknown notification sources * Mi Band: Fix crash with unknown notification sources

4
app/build.gradle
View File

@ -26,8 +26,8 @@ android {
targetSdkVersion 23 targetSdkVersion 23
// note: always bump BOTH versionCode and versionName! // note: always bump BOTH versionCode and versionName!
versionName "0.15.2" versionName "0.16.0"
versionCode 79 versionCode 80
} }
buildTypes { buildTypes {
release { 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); ZipInputStream zis = new ZipInputStream(afin);
ZipEntry ze; ZipEntry ze;
boolean found = false;
try { try {
while ((ze = zis.getNextEntry()) != null) { while ((ze = zis.getNextEntry()) != null) {
if (ze.getName().startsWith(dir)) { if (ze.getName().startsWith(dir)) {
platformDir = dir; platformDir = dir;
found = true;
break; break;
} }
} }
@ -135,6 +137,9 @@ public class PBWReader {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (found) {
break;
}
} }
if (platform.equals("chalk") && platformDir.equals("")) { 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"?> <?xml version="1.0" encoding="utf-8"?>
<changelog> <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"> <release version="0.15.2" versioncode="79">
<change>Mi Band: Fix crash with unknown notification sources</change> <change>Mi Band: Fix crash with unknown notification sources</change>
</release> </release>