Skip to content

HmsMaps: Add delayed callback #3266

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

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HmsMaps: Add delayed callback #3266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 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 @@ -621,7 +621,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
if (loaded) {
Log.d(TAG, "Invoking callback instantly, as map is loaded")
try {
callback.onMapLoaded()
scheduleExecute { callback.onMapLoaded() }
} catch (e: Exception) {
Log.w(TAG, e)
}
Expand Down Expand Up @@ -848,6 +848,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
}
internalOnInitializedCallbackList.clear()
fakeWatermark { Log.d(TAG_LOGO, "fakeWatermark success") }
scheduleExecute { loadedCallback?.onMapLoaded() }

mapView?.visibility = View.VISIBLE
}
Expand Down Expand Up @@ -955,7 +956,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
Log.d("$TAG:$tag", "Invoking callback now, as map is initialized")
val wasCallbackActive = isInvokingInitializedCallbacks.getAndSet(true)
runOnMainLooper(forceQueue = wasCallbackActive) {
runCallbacks()
scheduleExecute { runCallbacks() }
}
if (!wasCallbackActive) isInvokingInitializedCallbacks.set(false)
} else {
Expand All @@ -974,10 +975,17 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
Log.w(TAG, "onTransact [unknown]: $code, $data, $flags"); false
}


private fun scheduleExecute(block:() -> Unit) {
Handler(Looper.getMainLooper()).postDelayed({
try { block.invoke() } catch (_: Exception) {}
}, ON_MAP_CALLBACK_DELAY)
}

companion object {
private const val TAG = "GmsGoogleMap"

private const val TAG_LOGO = "fakeWatermark"
private const val MAX_TIMES = 300
private const val ON_MAP_CALLBACK_DELAY = 300L
}
}