From 73fd85a8c7ff2762dd615f3a5caa9d9f1db2b6f5 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Mon, 3 Jun 2019 15:35:51 +0200
Subject: [PATCH] mapbox: Allow savedInstanceState to be null

---
 .../src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt   | 4 ++--
 .../src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt | 4 ++--
 .../src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 2dd285a3..c89e41aa 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
@@ -360,8 +360,8 @@ class GoogleMapImpl(private val context: Context, private val options: GoogleMap
         cameraIdleListener = listener
     }
 
-    fun onCreate(savedInstanceState: Bundle) {
-        mapView?.onCreate(savedInstanceState.toMapbox())
+    fun onCreate(savedInstanceState: Bundle?) {
+        mapView?.onCreate(savedInstanceState?.toMapbox())
         mapView?.getMapAsync(this::initMap)
     }
 
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
index 2ff4b485..2c9b7dab 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
@@ -46,14 +46,14 @@ class MapFragmentImpl(private val activity: Activity) : IMapFragmentDelegate.Stu
         }
     }
 
-    override fun onCreateView(layoutInflater: IObjectWrapper, container: IObjectWrapper, savedInstanceState: Bundle): IObjectWrapper {
+    override fun onCreateView(layoutInflater: IObjectWrapper, container: IObjectWrapper, savedInstanceState: Bundle?): IObjectWrapper {
         if (map == null) {
             map = GoogleMapImpl(activity, options ?: GoogleMapOptions())
             map!!.onCreate(savedInstanceState)
             return ObjectWrapper.wrap(map!!.view)
         } else {
             val view = map!!.view
-            val parent = view?.parent as ViewGroup
+            val parent = view.parent as ViewGroup
             parent.removeView(view)
             return ObjectWrapper.wrap(view)
         }
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
index fe00f687..70d1b831 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapView.kt
@@ -35,7 +35,7 @@ class MapViewImpl(private val context: Context, options: GoogleMapOptions?) : IM
         this.options = options ?: GoogleMapOptions()
     }
 
-    override fun onCreate(savedInstanceState: Bundle) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         map = GoogleMapImpl(context, options)
         map?.onCreate(savedInstanceState)
     }