From 7e4d8aed8f33e0c2e9d7a8fdb12c5a2566558f81 Mon Sep 17 00:00:00 2001 From: Pablo Guardiola Date: Thu, 12 Jan 2023 16:40:03 +0100 Subject: [PATCH 1/2] fix copilot unrecognized fields serialization (#6821) --- .../com/mapbox/navigation/copilot/MapboxCopilotImpl.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt b/libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt index 4146ee91c95..d1fab41ef31 100644 --- a/libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt +++ b/libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt @@ -4,8 +4,11 @@ import android.content.pm.ApplicationInfo import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner -import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.mapbox.api.directions.v5.DirectionsAdapterFactory import com.mapbox.common.UploadOptions +import com.mapbox.geojson.Point +import com.mapbox.geojson.PointAsCoordinatesTypeAdapter import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI import com.mapbox.navigation.base.route.NavigationRoute import com.mapbox.navigation.copilot.HistoryAttachmentsUtils.copyToAndRemove @@ -397,7 +400,10 @@ internal class MapboxCopilotImpl( internal companion object { - internal val gson = Gson() + internal val gson = GsonBuilder() + .registerTypeAdapterFactory(DirectionsAdapterFactory.create()) + .registerTypeAdapter(Point::class.java, PointAsCoordinatesTypeAdapter()) + .create() internal const val GZ = "gz" internal const val ZIP = "zip" internal const val MEDIA_TYPE_ZIP = "application/zip" From 173c9c104a945db69caa42e7500be6af40d446b1 Mon Sep 17 00:00:00 2001 From: Pablo Guardiola Date: Mon, 19 Dec 2022 13:05:29 -0500 Subject: [PATCH 2/2] [copilot] add proguard rule to prevent obfuscation of route properties (#6762) --- libnavigation-copilot/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/libnavigation-copilot/proguard-rules.pro b/libnavigation-copilot/proguard-rules.pro index e69de29bb2d..9e836721de3 100644 --- a/libnavigation-copilot/proguard-rules.pro +++ b/libnavigation-copilot/proguard-rules.pro @@ -0,0 +1 @@ +-keepnames class com.mapbox.api.directions.v5.models.** {*;}