Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 41fe8ab

Browse files
authored
[testapp] fixup onSaveInstanceState usage (#539)
1 parent 669e2b7 commit 41fe8ab

File tree

6 files changed

+18
-36
lines changed

6 files changed

+18
-36
lines changed

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
44
import android.content.Context
55
import android.graphics.*
66
import android.os.Bundle
7-
import android.os.PersistableBundle
87
import android.view.View
98
import androidx.appcompat.app.AppCompatActivity
109
import com.mapbox.mapboxsdk.maps.Style
@@ -56,11 +55,9 @@ class OverlayMapActivity : AppCompatActivity() {
5655
mapView.onDestroy()
5756
}
5857

59-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
60-
super.onSaveInstanceState(outState, outPersistentState)
61-
outState?.let {
62-
mapView.onSaveInstanceState(it)
63-
}
58+
override fun onSaveInstanceState(outState: Bundle) {
59+
super.onSaveInstanceState(outState)
60+
mapView.onSaveInstanceState(outState)
6461
}
6562

6663
class OverlayView(context: Context) : View(context) {

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style
22

33
import android.graphics.Color
44
import android.os.Bundle
5-
import android.os.PersistableBundle
65
import androidx.appcompat.app.AppCompatActivity
76
import com.mapbox.geojson.Point
87
import com.mapbox.mapboxsdk.camera.CameraPosition
@@ -115,11 +114,9 @@ class DistanceExpressionActivity : AppCompatActivity() {
115114
mapView.onDestroy()
116115
}
117116

118-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
119-
super.onSaveInstanceState(outState, outPersistentState)
120-
outState?.let {
121-
mapView.onSaveInstanceState(it)
122-
}
117+
override fun onSaveInstanceState(outState: Bundle) {
118+
super.onSaveInstanceState(outState)
119+
mapView.onSaveInstanceState(outState)
123120
}
124121

125122
companion object {

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style
22

33
import android.graphics.PointF
44
import android.os.Bundle
5-
import android.os.PersistableBundle
65
import android.view.MotionEvent
76
import android.view.View
87
import androidx.appcompat.app.AppCompatActivity
@@ -319,11 +318,9 @@ class DraggableMarkerActivity : AppCompatActivity() {
319318
mapView.onDestroy()
320319
}
321320

322-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
323-
super.onSaveInstanceState(outState, outPersistentState)
324-
outState?.let {
325-
mapView.onSaveInstanceState(it)
326-
}
321+
override fun onSaveInstanceState(outState: Bundle) {
322+
super.onSaveInstanceState(outState)
323+
mapView.onSaveInstanceState(outState)
327324
}
328325
}
329326

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style
22

33
import android.graphics.drawable.Drawable
44
import android.os.Bundle
5-
import android.os.PersistableBundle
65
import androidx.appcompat.app.AppCompatActivity
76
import androidx.core.content.res.ResourcesCompat
87
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
@@ -68,11 +67,9 @@ class NoStyleActivity : AppCompatActivity() {
6867
mapView.onDestroy()
6968
}
7069

71-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
72-
super.onSaveInstanceState(outState, outPersistentState)
73-
outState?.let {
74-
mapView.onSaveInstanceState(it)
75-
}
70+
override fun onSaveInstanceState(outState: Bundle) {
71+
super.onSaveInstanceState(outState)
72+
mapView.onSaveInstanceState(outState)
7673
}
7774

7875
companion object {

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.turf
22

33
import android.graphics.Color
44
import android.os.Bundle
5-
import android.os.PersistableBundle
65
import androidx.appcompat.app.AppCompatActivity
76
import com.mapbox.geojson.*
87
import com.mapbox.mapboxsdk.camera.CameraPosition
@@ -198,11 +197,9 @@ class MapSnapshotterWithinExpression : AppCompatActivity() {
198197
mapView.onDestroy()
199198
}
200199

201-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
202-
super.onSaveInstanceState(outState, outPersistentState)
203-
outState?.let {
204-
mapView.onSaveInstanceState(it)
205-
}
200+
override fun onSaveInstanceState(outState: Bundle) {
201+
super.onSaveInstanceState(outState)
202+
mapView.onSaveInstanceState(outState)
206203
}
207204

208205
private fun bufferLineStringGeometry(): Polygon {

MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.mapbox.mapboxsdk.testapp.activity.turf
33
import android.graphics.Color
44
import android.os.Bundle
55
import android.os.Handler
6-
import android.os.PersistableBundle
76
import androidx.appcompat.app.AppCompatActivity
87
import com.mapbox.geojson.*
98
import com.mapbox.mapboxsdk.camera.CameraPosition
@@ -189,11 +188,9 @@ class WithinExpressionActivity : AppCompatActivity() {
189188
mapView.onDestroy()
190189
}
191190

192-
override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
193-
super.onSaveInstanceState(outState, outPersistentState)
194-
outState?.let {
195-
mapView.onSaveInstanceState(it)
196-
}
191+
override fun onSaveInstanceState(outState: Bundle) {
192+
super.onSaveInstanceState(outState)
193+
mapView.onSaveInstanceState(outState)
197194
}
198195

199196
private fun bufferLineStringGeometry(lineString: LineString? = null): Polygon {

0 commit comments

Comments
 (0)