meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

oops - I wasn't properly checking for presence of firmware files

Browse source
This commit is contained in:
geeksville 2020-07-02 10:32:47 -07:00
parent 0006858469
commit 7bd6615cb7
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
View file

@ -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
}