Merge pull request #226 from geeksville/dev

1.1.39

app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 20138 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.1.38"
+        versionCode 20139 // format is Mmmss (where M is 1+the numeric major number
+        versionName "1.1.39"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
@@ -156,7 +156,7 @@ dependencies {
     implementation 'com.github.mik3y:usb-serial-for-android:v3.0.0'
 
     // mapbox
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.5.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.6.0'
 
     // mapbox specifies a really old version of okhttp3 which causes lots of API warnings.  trying a newer version
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'

app/proguard-rules.pro

@@ -30,6 +30,10 @@
 -keep class com.geeksville.mesh.**{*;}
 -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { <fields>; }
 
+# Recommended by mapbox to prevent native crashes
+-dontwarn com.mapbox.**
+-keep class com.mapbox.** { *; }
+
 # for kotlinx.serialization
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.SerializationKt

app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt

@@ -204,9 +204,9 @@ class MapFragment : ScreenFragment("Map"), Logging {
         mapView?.onResume()
     }
 
-    override fun onDestroy() {
+    override fun onDestroyView() {
         mapView?.onDestroy()
-        super.onDestroy()
+        super.onDestroyView()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt

@@ -270,8 +270,12 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
 
             val testnodes = listOf(
                 DeviceListEntry("Simulated interface", "m", true),
+                DeviceListEntry(context.getString(R.string.none), "n", true)
+                /* Don't populate fake bluetooth devices, because we don't want testlab inside of google
+                to try and use them.
+
                 DeviceListEntry("Meshtastic_ab12", "xaa", false),
-                DeviceListEntry("Meshtastic_32ac", "xbb", true)
+                DeviceListEntry("Meshtastic_32ac", "xbb", true) */
             )
 
             devices.value = (testnodes.map { it.address to it }).toMap().toMutableMap()