Skip to content

Commit a464638

Browse files
committed
fix(android): avoid name shadowing in ProxyLifecycleProvider
See #20
1 parent 4f6263a commit a464638

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

android/src/main/kotlin/video/api/flutter/uploader/ProxyLifecycleProvider.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import androidx.lifecycle.LifecycleRegistry
2020
internal class ProxyLifecycleProvider(activity: Activity) :
2121
Application.ActivityLifecycleCallbacks, LifecycleOwner {
2222
@VisibleForTesting
23-
val lifecycle = LifecycleRegistry(this)
23+
val lifecycleRegistry = LifecycleRegistry(this)
2424

2525
private val registrarActivityHashCode: Int = activity.hashCode()
2626

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

3838
override fun onActivityStarted(activity: Activity) {
3939
if (activity.hashCode() != registrarActivityHashCode) {
4040
return
4141
}
42-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
42+
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
4343
}
4444

4545
override fun onActivityResumed(activity: Activity) {
4646
if (activity.hashCode() != registrarActivityHashCode) {
4747
return
4848
}
49-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
49+
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
5050
}
5151

5252
override fun onActivityPaused(activity: Activity) {
5353
if (activity.hashCode() != registrarActivityHashCode) {
5454
return
5555
}
56-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
56+
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
5757
}
5858

5959
override fun onActivityStopped(activity: Activity) {
6060
if (activity.hashCode() != registrarActivityHashCode) {
6161
return
6262
}
63-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
63+
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
6464
}
6565

6666
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
@@ -69,10 +69,10 @@ internal class ProxyLifecycleProvider(activity: Activity) :
6969
return
7070
}
7171
activity.application.unregisterActivityLifecycleCallbacks(this)
72-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
72+
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
7373
}
7474

7575
override fun getLifecycle(): Lifecycle {
76-
return lifecycle
76+
return lifecycleRegistry
7777
}
7878
}

0 commit comments

Comments
 (0)