From 90c9fe78663d6e99d579761ae44ce3e92708e2f7 Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Sun, 28 Nov 2021 16:39:10 -0300
Subject: [PATCH 1/3] fix mapbox secrets

---
 .github/workflows/android.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6023a8552..9f45ba0dc 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,21 +14,19 @@ jobs:
         with:
           submodules: true
       - name: Loading secrets
-        env:
-          gservices: ${{ secrets.gservices }}
-          mapboxtoken: ${{ secrets.mapboxtoken }}
         run: |
           # not yet needed echo $gservices > ./app/google-services.json
           rm ./app/google-services.json          
           cp ./app/google-services-example.json ./app/google-services.json
-
           rm ./app/src/main/res/values/mapbox-token.xml
           cp ./app/special/mapbox-token.xml ./app/src/main/res/values/
           # The following would not be valid XML, don't use yet
-          # echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml
-
+          # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml
           mkdir -p ~/.gradle
-          echo "MAPBOX_DOWNLOADS_TOKEN=$mapboxtoken" >>~/.gradle/gradle.properties
+          echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
+        env:
+          gservices: ${{ secrets.gservices }}
+          MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }}
       - name: Mock curfirmware version for CI
         run: |
           rm ./app/src/main/res/values/curfirmwareversion.xml
@@ -40,3 +38,4 @@ jobs:
           java-version: 16
       - name: Unit tests
         run: bash ./gradlew test --stacktrace
+        

From 72cec7c81eb6f0313dc9e05cdd66b0f29887e588 Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Sun, 28 Nov 2021 16:42:51 -0300
Subject: [PATCH 2/3] update gradle unmockplugin:0.7.9

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c9c652ff1..4c16a0dd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         classpath 'com.github.triplet.gradle:play-publisher:2.8.0'
 
         // for unit testing https://github.com/bjoernQ/unmock-plugin
-        classpath 'com.github.bjoernq:unmockplugin:0.7.6'
+        classpath 'com.github.bjoernq:unmockplugin:0.7.9'
     }
 }
 

From 365da25fa1916fc41f679c2766d693a09f49529f Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Sun, 28 Nov 2021 16:49:54 -0300
Subject: [PATCH 3/3] short_firmware_version --> cur_firmware_version

SettingsFragment.kt: short_firmware_version --> cur_firmware_version
revert: https://github.com/meshtastic/Meshtastic-Android/commit/56fd43e6f5f27f69b36260a3bcc141028dc1c4c9
---
 app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 29b98e8eb..5983ba18c 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.short_firmware_version))
+                getString(R.string.update_to).format(getString(R.string.cur_firmware_version))
 
             val progress = service.updateStatus