Skip to content

Commit c80089d

Browse files
authored
fix useLifecycleObserver not trigger lifecycle events issue (#65)
1 parent d71a034 commit c80089d

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

android/src/main/java/com/segment/analytics/kotlin/android/plugins/AndroidLifecyclePlugin.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,15 @@ class AndroidLifecyclePlugin() : Application.ActivityLifecycleCallbacks, Default
4747

4848
override fun setup(analytics: Analytics) {
4949
super.setup(analytics)
50-
application = analytics.configuration.application as? Application
51-
?: error("no android application context registered")
52-
storage = analytics.storage
50+
analytics.configuration.let {
51+
application = it.application as? Application
52+
?: error("no android application context registered")
5353

54-
// setup lifecycle listeners
55-
application.registerActivityLifecycleCallbacks(this)
56-
if (useLifecycleObserver) {
57-
lifecycle = ProcessLifecycleOwner.get().lifecycle
58-
lifecycle.addObserver(this)
54+
shouldTrackApplicationLifecycleEvents = it.trackApplicationLifecycleEvents
55+
trackDeepLinks = it.trackDeepLinks
56+
useLifecycleObserver = it.useLifecycleObserver
5957
}
58+
storage = analytics.storage
6059

6160
val packageManager: PackageManager = application.packageManager
6261
packageInfo = try {
@@ -65,10 +64,11 @@ class AndroidLifecyclePlugin() : Application.ActivityLifecycleCallbacks, Default
6564
throw AssertionError("Package not found: " + application.packageName)
6665
}
6766

68-
analytics.configuration.let {
69-
shouldTrackApplicationLifecycleEvents = it.trackApplicationLifecycleEvents
70-
trackDeepLinks = it.trackDeepLinks
71-
useLifecycleObserver = it.useLifecycleObserver
67+
// setup lifecycle listeners
68+
application.registerActivityLifecycleCallbacks(this)
69+
if (useLifecycleObserver) {
70+
lifecycle = ProcessLifecycleOwner.get().lifecycle
71+
lifecycle.addObserver(this)
7272
}
7373
}
7474

0 commit comments

Comments
 (0)