From 6f719f3111bf4694561f45023d6bd07631a5755c Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sat, 11 Dec 2021 19:06:24 -0300
Subject: [PATCH] undo 365da25 & update curfirmwareversion.xml

---
 app/special/curfirmwareversion.xml                           | 5 +++--
 app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/special/curfirmwareversion.xml b/app/special/curfirmwareversion.xml
index d154316f7..ee8340b5e 100644
--- a/app/special/curfirmwareversion.xml
+++ b/app/special/curfirmwareversion.xml
@@ -2,8 +2,9 @@
 
 <!-- This file is kept in source control because it reflects the last stable
 release.  It is used by the android app for forcing software updates.  Do not edit.
-Generated by bin/buildall.sh -->
+Generated by Meshtastic-device/bin/buildall.sh -->
 
 <resources>
-    <string name="cur_firmware_version">0.2.0</string>
+    <string name="cur_firmware_version" translatable="false">0.2.0.abcdefg</string>
+    <string name="short_firmware_version" translatable="false">0.2.0</string>
 </resources>
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 5983ba18c..29b98e8eb 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -499,7 +499,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         if (model.isConnected.value == MeshService.ConnectionState.CONNECTED && info != null && info.shouldUpdate && info.couldUpdate && service != null) {
             binding.updateFirmwareButton.visibility = View.VISIBLE
             binding.updateFirmwareButton.text =
-                getString(R.string.update_to).format(getString(R.string.cur_firmware_version))
+                getString(R.string.update_to).format(getString(R.string.short_firmware_version))
 
             val progress = service.updateStatus