Skip to content

HmsMap: Uber route drift modification #2737

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
mar-v-in merged 3 commits into from
Mar 13, 2025
Merged

HmsMap: Uber route drift modification #2737

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10bc699
HmsMap: Uber route drift modification
DaVinci9196 Jan 8, 2025
da80a75
cleanup
DaVinci9196 Jan 8, 2025
a3816df
fixed #2743 crash
DaVinci9196 Jan 15, 2025
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
26 changes: 15 additions & 11 deletions play-services-maps/core/hms/src/main/kotlin/org/microg/gms/maps/hms/GoogleMap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
markers.map { it.value.remove() }
markers.clear()
// BitmapDescriptorFactoryImpl.unregisterMap(map)
view.removeCallbacks(controlLayerRun)
view.removeView(mapView)
// TODO can crash?
mapView?.onDestroy()
Expand Down Expand Up @@ -798,17 +799,20 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
}

private fun refreshContainerLayer(hide: Boolean = false) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
view.onDescendantInvalidated(mapView!!, mapView!!)
}
val parentView = view.parent?.parent
if (parentView != null) {
if (parentView is ViewGroup) {
for (i in 0 until parentView.childCount) {
val viewChild = parentView.getChildAt(i)
// Uber is prone to route drift, so here we hide the corresponding layer
if (viewChild::class.qualifiedName == "com.ubercab.android.map.fu") {
viewChild.visibility = if (hide) View.INVISIBLE else View.VISIBLE
runCatching {
if (mapView == null) return
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
view.onDescendantInvalidated(mapView!!, mapView!!)
}
val parentView = view.parent?.parent
if (parentView != null) {
if (parentView is ViewGroup) {
for (i in 0 until parentView.childCount) {
val viewChild = parentView.getChildAt(i)
// Uber is prone to route drift, so here we hide the corresponding layer
if (viewChild::class.qualifiedName?.startsWith("com.ubercab") == true) {
viewChild.visibility = if (hide) View.INVISIBLE else View.VISIBLE
}
}
}
}
Expand Down
Loading