Fix firmware installation on Pebble Time Round

Closes #602
This commit is contained in:
Andreas Shimokawa 2017-03-17 22:34:50 +01:00
parent 9eade33d72
commit fe07e09d41
1 changed files with 7 additions and 6 deletions

View File

@ -97,10 +97,14 @@ public class PBWReader {
return; return;
} }
String platformDir = determinePlatformDir(uriHelper, platform); String platformDir = "";
if (!uriHelper.getFileName().endsWith(".pbz")) {
platformDir = determinePlatformDir(uriHelper, platform);
if (platform.equals("chalk") && platformDir.equals("")) { if (platform.equals("chalk") && platformDir.equals("")) {
return; return;
} }
}
LOG.info("using platformdir: '" + platformDir + "'"); LOG.info("using platformdir: '" + platformDir + "'");
String appName = null; String appName = null;
@ -237,9 +241,6 @@ public class PBWReader {
private String determinePlatformDir(UriHelper uriHelper, String platform) throws IOException { private String determinePlatformDir(UriHelper uriHelper, String platform) throws IOException {
String platformDir = ""; String platformDir = "";
if (uriHelper.getFileName().endsWith(".pbz")) {
return platformDir;
}
/* /*
* for aplite and basalt it is possible to install 2.x apps which have no subfolder * for aplite and basalt it is possible to install 2.x apps which have no subfolder
* we still prefer the subfolders if present. * we still prefer the subfolders if present.