From fe07e09d41488006ec98eef088abec910bb9bc3e Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 17 Mar 2017 22:34:50 +0100
Subject: [PATCH] Fix firmware installation on Pebble Time Round

Closes #602
---
 .../gadgetbridge/devices/pebble/PBWReader.java      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
index 5cb0dc8b..ee2458f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
@@ -97,9 +97,13 @@ public class PBWReader {
             return;
         }
 
-        String platformDir = determinePlatformDir(uriHelper, platform);
-        if (platform.equals("chalk") && platformDir.equals("")) {
-            return;
+        String platformDir = "";
+        if (!uriHelper.getFileName().endsWith(".pbz")) {
+            platformDir = determinePlatformDir(uriHelper, platform);
+
+            if (platform.equals("chalk") && platformDir.equals("")) {
+                return;
+            }
         }
 
         LOG.info("using platformdir: '" + platformDir + "'");
@@ -237,9 +241,6 @@ public class PBWReader {
     private String determinePlatformDir(UriHelper uriHelper, String platform) throws IOException {
         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
          * we still prefer the subfolders if present.