mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-23 19:26:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5073 from vector-im/feature/adm/instrumentation-modification-error

Browse source 
Fixing concurrent modification espresso errors
This commit is contained in:
Benoit Marty 2022-01-27 09:59:24 +01:00 committed by GitHub
commit 590f4bee25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
vector/src/androidTest/java/im/vector/app/EspressoExt.kt
View file

@ -160,43 +160,50 @@ fun initialSyncIdlingResource(session: Session): IdlingResource {
}
fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
val lifecycleMonitor = ActivityLifecycleMonitorRegistry.getInstance()
val res = object : IdlingResource, ActivityLifecycleCallback {
private var callback: IdlingResource.ResourceCallback? = null
private var resumedActivity: Activity? = null
private val uniqTS = System.currentTimeMillis()
var hasResumed = false
private var currentActivity: Activity? = null
val uniqTS = System.currentTimeMillis()
override fun getName() = "activityIdlingResource_${activityClass.name}_$uniqTS"
override fun isIdleNow(): Boolean {
val currentActivity = currentActivity ?: ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
val activity = resumedActivity ?: ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).firstOrNull {
activityClass == it.javaClass
}
val isIdle = hasResumed || currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
println("*** [$name] isIdleNow activityIdlingResource $currentActivity isIdle:$isIdle")
val isIdle = activity != null
if (isIdle) {
unregister()
}
return isIdle
}
override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
println("*** [$name] registerIdleTransitionCallback $callback")
this.callback = callback
// if (hasResumed) callback?.onTransitionToIdle()
}
override fun onActivityLifecycleChanged(activity: Activity?, stage: Stage?) {
println("*** [$name] onActivityLifecycleChanged $activity $stage")
currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
val isIdle = currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
println("*** [$name] onActivityLifecycleChanged $currentActivity isIdle:$isIdle")
if (isIdle) {
hasResumed = true
if (activityClass == activity?.javaClass) {
when (stage) {
Stage.RESUMED -> {
unregister()
resumedActivity = activity
println("*** [$name] onActivityLifecycleChanged callback: $callback")
callback?.onTransitionToIdle()
ActivityLifecycleMonitorRegistry.getInstance().removeLifecycleCallback(this)
}
}
}
ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(res)
}
private fun unregister() {
lifecycleMonitor.removeLifecycleCallback(this)
}
}
lifecycleMonitor.addLifecycleCallback(res)
return res
}