From 5839489b1c990a499dc9b0f7d5b1709ea6950f3c Mon Sep 17 00:00:00 2001
From: Alexandru Chircu <alexch@e.email>
Date: Wed, 5 Aug 2020 08:01:59 +0000
Subject: [PATCH] Don't null a param which is still used, stub for missing
 function. Fixes #1126.

---
 .../kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt     | 10 +++++++++-
 .../java/org/microg/gms/maps/vtm/GoogleMapImpl.java    |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
index e5addbaa..02fe206b 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
@@ -223,6 +223,11 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
 
     override fun stopAnimation() = map?.cancelTransitions() ?: Unit
 
+    override fun setMapStyle(options: MapStyleOptions?): Boolean {
+        Log.d(TAG, "setMapStyle options: " + options?.getJson())
+        return true
+    }
+
     override fun setMinZoomPreference(minZoom: Float) {
         map?.setMinZoomPreference(minZoom.toDouble() - 1)
     }
@@ -719,7 +724,10 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
         // TODO can crash?
         mapView?.onDestroy()
         mapView = null
-        map = null
+
+        // Don't make it null; this object is not deleted immediately, and it may want to access map.* stuff
+        //map = null
+
         created = false
         initialized = false
         loaded = false
diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
index f34c066e..87a51209 100644
--- a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
@@ -60,6 +60,7 @@ import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.MapStyleOptions;
 import com.google.android.gms.maps.model.PolygonOptions;
 import com.google.android.gms.maps.model.PolylineOptions;
 import com.google.android.gms.maps.model.TileOverlayOptions;
@@ -211,6 +212,12 @@ public class GoogleMapImpl extends IGoogleMapDelegate.Stub
 
     }
 
+    @Override
+    public boolean setMapStyle(MapStyleOptions options) throws RemoteException {
+        Log.d(TAG, "unimplemented Method: setMapStyle");
+        return true;
+    }
+
     @Override
     public void setMinZoomPreference(float minZoom) throws RemoteException {
         Log.d(TAG, "unimplemented Method: setMinZoomPreference");