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

Pebble: support installing 3.x apps on OG Pebble

This commit is contained in:
Andreas Shimokawa 2015-12-05 16:06:42 +01:00
parent f3a33cb620
commit bc108ba095
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,10 +18,12 @@ import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
@ -93,25 +95,43 @@ public class PBWReader {
} }
String platformDir = ""; String platformDir = "";
if (!uri.toString().endsWith(".pbz") && !platform.equals("aplite")) { if (!uri.toString().endsWith(".pbz")) {
platformDir = platform + "/"; platformDir = platform + "/";
} }
InputStream fin; ZipFile zipFile;
try { try {
fin = new BufferedInputStream(cr.openInputStream(uri)); zipFile = new ZipFile(uri.getPath());
} catch (IOException e) {
} catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
return; return;
} }
ZipInputStream zis = new ZipInputStream(fin);
ZipEntry ze;
if (platform.equals("aplite")) {
boolean hasApliteDir = false;
Enumeration zentries = zipFile.entries();
while (zentries.hasMoreElements()) {
ZipEntry entry = (ZipEntry) zentries.nextElement();
if (entry.getName().startsWith("aplite/")) {
hasApliteDir = true;
break;
}
}
if (!hasApliteDir) {
platformDir = "";
}
}
pebbleInstallables = new ArrayList<>(); pebbleInstallables = new ArrayList<>();
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
int count; int count;
try { try {
while ((ze = zis.getNextEntry()) != null) { Enumeration zentries = zipFile.entries();
while (zentries.hasMoreElements()) {
ZipEntry ze = (ZipEntry) zentries.nextElement();
InputStream zis = zipFile.getInputStream(ze);
String fileName = ze.getName(); String fileName = ze.getName();
if (fileName.equals(platformDir + "manifest.json")) { if (fileName.equals(platformDir + "manifest.json")) {
long bytes = ze.getSize(); long bytes = ze.getSize();
@ -206,8 +226,8 @@ public class PBWReader {
LOG.info("got flags from pebble-app.bin: " + mFlags); LOG.info("got flags from pebble-app.bin: " + mFlags);
// more follows but, not interesting for us // more follows but, not interesting for us
} }
}
zis.close(); zis.close();
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }