From 7bd6615cb77dd0f03a8770701a16dc3ce41c5929 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Thu, 2 Jul 2020 10:32:47 -0700
Subject: [PATCH] oops - I wasn't properly checking for presence of firmware
 files

---
 .../com/geeksville/mesh/service/SoftwareUpdateService.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
index 38b31b0a6..d1f6957f1 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
@@ -230,10 +230,12 @@ class SoftwareUpdateService : JobIntentService(), Logging {
             val (region) = regionRegex.find(hwVer)?.destructured
                 ?: throw Exception("Malformed hw version")
 
-            val name = "firmware/firmware-$mfg-$region-$curver.bin"
+            val base = "firmware-$mfg-$region-$curver.bin"
+
             // Check to see if the file exists (some builds might not include update files for size reasons)
-            return if (!context.assets.list(name).isNullOrEmpty())
-                name
+            val firmwareFiles = context.assets.list("firmware") ?: arrayOf()
+            return if (firmwareFiles.contains(base))
+                "firmware/$base"
             else
                 null
         }