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

Pebble: Allow installing apps compiled with SDK 2.x also on the balast platform (pebble time, pebble time steel)

master
Andreas Shimokawa 2015-12-11 21:09:29 +01:00
parent 854a7ee1ac
commit 4528aaf22f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
###Changelog
####Next Version
* Pebble: Allow installing apps compiled with SDK 2.x also on the balast platform (Time, Time Steel)
####Version 0.6.9
* Pebble: Store app details in pbw-cache and display them in app manager on firmware 3.x
* Pebble: Increase maximum notification body length from 255 to 512 bytes on firmware 3.x

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

@ -96,16 +96,21 @@ public class PBWReader {
if (!uri.toString().endsWith(".pbz")) {
platformDir = platform + "/";
if (platform.equals("aplite")) {
boolean hasApliteDir = false;
/*
* for aplite and basalt it is possible to install 2.x apps which have no subfolder
* we still prefer the subfolders if present.
* chalk needs to be its subfolder
*/
if (platform.equals("aplite") || platform.equals("basalt")) {
boolean hasPlatformDir = false;
InputStream afin = new BufferedInputStream(cr.openInputStream(uri));
ZipInputStream zis = new ZipInputStream(afin);
ZipEntry ze;
try {
while ((ze = zis.getNextEntry()) != null) {
if (ze.getName().startsWith("aplite/")) {
hasApliteDir = true;
if (ze.getName().startsWith(platformDir)) {
hasPlatformDir = true;
break;
}
}
@ -114,7 +119,7 @@ public class PBWReader {
e.printStackTrace();
}
if (!hasApliteDir) {
if (!hasPlatformDir) {
platformDir = "";
}
}