Merge branch 'osmdroid-phase3' of github.com:ScriptTactics/Meshtastic-Android into osmdroid-phase3

.github/workflows/android.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
@@ -37,7 +37,7 @@ jobs:
       run: ./gradlew assembleDebug
 
     - name: Upload APK
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: app-debug
         path: app/build/outputs/apk/debug/app-debug.apk

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 

app/build.gradle

@@ -43,8 +43,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 30
-        versionCode 20345 // format is Mmmss (where M is 1+the numeric major number
+        versionCode 20348 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.3.45"
+        versionName "1.3.48"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio

app/src/main/java/com/geeksville/mesh/model/Channel.kt

@@ -29,8 +29,13 @@ data class Channel(
         // The default channel that devices ship with
         val default = Channel(
             channelSettings { psk = ByteString.copyFrom(defaultPSK) },
-            // reference: NodeDB::installDefaultConfig
+            // references: NodeDB::installDefaultConfig / Channels::initDefaultChannel
-            loRaConfig { txEnabled = true; modemPreset = ModemPreset.LONG_FAST; hopLimit = 3 }
+            loRaConfig {
+                usePreset = true
+                modemPreset = ModemPreset.LONG_FAST
+                hopLimit = 3
+                txEnabled = true
+            }
         )
     }
 

app/src/main/java/com/geeksville/mesh/model/UIState.kt

@@ -465,7 +465,7 @@ class UIViewModel @Inject constructor(
 
                         // Filter out of our results any packet that doesn't report SNR.  This
                         // is primarily ADMIN_APP.
-                        if (proto.rxSnr > 0.0f) {
+                        if (proto.rxSnr != 0.0f) {
                             val rxDateTime = dateFormat.format(packet.received_date)
                             val rxFrom = proto.from.toUInt()
                             val senderName = nodesById[proto.from]?.user?.longName ?: ""

app/src/main/proto

@@ -1 +1 @@
-Subproject commit d0559bfa3c31023ed2f2aa3807b6a0a1da9a6feb
+Subproject commit a79e3aef8117dad642b1a011ec0438619616740c