Skip to content

Commit 951e618

Browse files
author
Pablo Guardiola
authored
Backport #6821 and #6762 to release-v2.8 (#6823)
* fix copilot unrecognized fields serialization (#6821) * [copilot] add proguard rule to prevent obfuscation of route properties (#6762)
1 parent cdd594e commit 951e618

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-keepnames class com.mapbox.api.directions.v5.models.** {*;}

libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ import android.content.pm.ApplicationInfo
44
import androidx.lifecycle.DefaultLifecycleObserver
55
import androidx.lifecycle.LifecycleOwner
66
import androidx.lifecycle.ProcessLifecycleOwner
7-
import com.google.gson.Gson
7+
import com.google.gson.GsonBuilder
8+
import com.mapbox.api.directions.v5.DirectionsAdapterFactory
89
import com.mapbox.common.UploadOptions
10+
import com.mapbox.geojson.Point
11+
import com.mapbox.geojson.PointAsCoordinatesTypeAdapter
912
import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
1013
import com.mapbox.navigation.base.route.NavigationRoute
1114
import com.mapbox.navigation.copilot.HistoryAttachmentsUtils.copyToAndRemove
@@ -397,7 +400,10 @@ internal class MapboxCopilotImpl(
397400

398401
internal companion object {
399402

400-
internal val gson = Gson()
403+
internal val gson = GsonBuilder()
404+
.registerTypeAdapterFactory(DirectionsAdapterFactory.create())
405+
.registerTypeAdapter(Point::class.java, PointAsCoordinatesTypeAdapter())
406+
.create()
401407
internal const val GZ = "gz"
402408
internal const val ZIP = "zip"
403409
internal const val MEDIA_TYPE_ZIP = "application/zip"

0 commit comments

Comments
 (0)