Skip to content

Backport #6821 and #6762 to release-v2.10 #6825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2023
Merged

Backport #6821 and #6762 to release-v2.10 #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e4d8ae
fix copilot unrecognized fields serialization (#6821)
Jan 12, 2023
173c9c1
[copilot] add proguard rule to prevent obfuscation of route propertie…
Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libnavigation-copilot/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-keepnames class com.mapbox.api.directions.v5.models.** {*;}
10 changes: 8 additions & 2 deletions libnavigation-copilot/src/main/java/com/mapbox/navigation/copilot/MapboxCopilotImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down