sforkowany z mirror/meshtastic-android
potential fix for the rare mapbox native crash (use onDestroyView)
rodzic
f44d9b16b1
commit
719bef7889
|
@ -156,7 +156,7 @@ dependencies {
|
||||||
implementation 'com.github.mik3y:usb-serial-for-android:v3.0.0'
|
implementation 'com.github.mik3y:usb-serial-for-android:v3.0.0'
|
||||||
|
|
||||||
// mapbox
|
// 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
|
// 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'
|
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
|
||||||
|
|
|
@ -30,6 +30,10 @@
|
||||||
-keep class com.geeksville.mesh.**{*;}
|
-keep class com.geeksville.mesh.**{*;}
|
||||||
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { <fields>; }
|
-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
|
# for kotlinx.serialization
|
||||||
-keepattributes *Annotation*, InnerClasses
|
-keepattributes *Annotation*, InnerClasses
|
||||||
-dontnote kotlinx.serialization.SerializationKt
|
-dontnote kotlinx.serialization.SerializationKt
|
||||||
|
|
|
@ -204,9 +204,9 @@ class MapFragment : ScreenFragment("Map"), Logging {
|
||||||
mapView?.onResume()
|
mapView?.onResume()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroyView() {
|
||||||
mapView?.onDestroy()
|
mapView?.onDestroy()
|
||||||
super.onDestroy()
|
super.onDestroyView()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSaveInstanceState(outState: Bundle) {
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
|
|
Ładowanie…
Reference in New Issue