diff --git a/app/src/main/kotlin/com/wire/android/WireApplication.kt b/app/src/main/kotlin/com/wire/android/WireApplication.kt index 0b3e9f223a..9b2d2823d1 100644 --- a/app/src/main/kotlin/com/wire/android/WireApplication.kt +++ b/app/src/main/kotlin/com/wire/android/WireApplication.kt @@ -148,11 +148,13 @@ class WireApplication : BaseApp() { override fun onActivityStarted(activity: Activity) { globalAnalyticsManager.onStart(activity) } + override fun onActivityResumed(activity: Activity) {} override fun onActivityPaused(activity: Activity) {} override fun onActivityStopped(activity: Activity) { globalAnalyticsManager.onStop(activity) } + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onActivityDestroyed(activity: Activity) {} }) @@ -278,7 +280,7 @@ class WireApplication : BaseApp() { companion object { fun byLevel(value: Int) = - values().firstOrNull { it.level == value } ?: TRIM_MEMORY_UNKNOWN + entries.firstOrNull { it.level == value } ?: TRIM_MEMORY_UNKNOWN } } diff --git a/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt b/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt index b2b1558482..b254197dd1 100644 --- a/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt +++ b/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt @@ -104,7 +104,7 @@ class CurrentScreenManager @Inject constructor( override fun onStart(owner: LifecycleOwner) { super.onStart(owner) - appLogger.i("${TAG}: onStart called") + appLogger.i("${TAG}: app onStart called") visibilityCount.getAndUpdate { currentValue -> val newValue = maxOf(0, currentValue + 1) isApplicationVisibleFlow.value = newValue > 0 @@ -114,7 +114,7 @@ class CurrentScreenManager @Inject constructor( override fun onStop(owner: LifecycleOwner) { super.onStop(owner) - appLogger.i("${TAG}: onStop called") + appLogger.i("${TAG}: app onStop called") visibilityCount.getAndUpdate { currentValue -> val newValue = maxOf(0, currentValue - 1) isApplicationVisibleFlow.value = newValue > 0 @@ -136,6 +136,26 @@ class CurrentScreenManager @Inject constructor( AnonymousAnalyticsManagerImpl.recordView(newView) } + override fun onCreate(owner: LifecycleOwner) { + super.onCreate(owner) + appLogger.i("$TAG app onCreate called") + } + + override fun onResume(owner: LifecycleOwner) { + super.onResume(owner) + appLogger.i("$TAG app onResume called") + } + + override fun onPause(owner: LifecycleOwner) { + super.onPause(owner) + appLogger.i("$TAG app onPause called") + } + + override fun onDestroy(owner: LifecycleOwner) { + super.onDestroy(owner) + appLogger.i("$TAG app onDestroy called") + } + companion object { private const val TAG = "CurrentScreenManager" } diff --git a/kalium b/kalium index 35cfb92581..1531aa6046 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 35cfb92581fea5325e1d2a348cbe803a5b25d317 +Subproject commit 1531aa60468a47cd045cb74213e145457e8810d6