From 7faf4d2d79e1583d5f2feb0a9d2d757459a23017 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Thu, 2 Jul 2020 10:37:35 -0700
Subject: [PATCH] fix software update button

---
 TODO.md                                                     | 1 -
 .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt    | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/TODO.md b/TODO.md
index e01cf3f47..5bf41ae0e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 
 - add faq entry about range and antennas and rain
 - first message sent is still doubled for some people
-- disable software update button after update finishes
 - let users set arbitrary params in android
 - add a low level settings screen (let user change any of the RadioConfig parameters)
 
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 5c7f95f0c..5932afa0e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -484,10 +484,12 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
                     updateProgressBar.progress = service.updateStatus
                     delay(2000) // Only check occasionally
                 }
+
+                val isSuccess = (service.updateStatus == -1)
                 scanStatusText.text =
-                    if (service.updateStatus == -1) "Update successful" else "Update failed"
+                    if (isSuccess) "Update successful" else "Update failed"
                 updateProgressBar.isEnabled = false
-                updateFirmwareButton.isEnabled = true
+                updateFirmwareButton.isEnabled = !isSuccess
             }
         }
     }