Merge pull request #312 from andrekir/AndroidCI

Fix: Android CI / Test

.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
+        

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
 

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