Skip to content

Commit

Permalink
fix(android): avoid name shadowing in ProxyLifecycleProvider
Browse files Browse the repository at this point in the history
See #20
  • Loading branch information
ThibaultBee committed Aug 8, 2024
1 parent 4f6263a commit a464638
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import androidx.lifecycle.LifecycleRegistry
internal class ProxyLifecycleProvider(activity: Activity) :
Application.ActivityLifecycleCallbacks, LifecycleOwner {
@VisibleForTesting
val lifecycle = LifecycleRegistry(this)
val lifecycleRegistry = LifecycleRegistry(this)

private val registrarActivityHashCode: Int = activity.hashCode()

Expand All @@ -32,35 +32,35 @@ internal class ProxyLifecycleProvider(activity: Activity) :
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
}

override fun onActivityStarted(activity: Activity) {
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
}

override fun onActivityResumed(activity: Activity) {
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
}

override fun onActivityPaused(activity: Activity) {
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
}

override fun onActivityStopped(activity: Activity) {
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
}

override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
Expand All @@ -69,10 +69,10 @@ internal class ProxyLifecycleProvider(activity: Activity) :
return
}
activity.application.unregisterActivityLifecycleCallbacks(this)
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
}

override fun getLifecycle(): Lifecycle {
return lifecycle
return lifecycleRegistry
}
}

0 comments on commit a464638

Please sign in to comment.