From f9a1888b9fcfa42fe0b68f7c1b8bc8c726388ce5 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Thu, 11 Jul 2024 23:24:22 -0700 Subject: [PATCH 1/2] Make ActivityLifecycleListener extend ActivityLifecycleCallacks with no-op defaults --- .../lifecycle/ActivityLifecycleListener.kt | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt index 0f4ce5da97..deddf05a4f 100644 --- a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt +++ b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt @@ -1,32 +1,25 @@ package io.embrace.android.embracesdk.internal.session.lifecycle import android.app.Activity +import android.app.Application.ActivityLifecycleCallbacks import android.os.Bundle /** - * Listener implemented by observers of the [ActivityLifecycleTracker]. + * Implementation of [ActivityLifecycleCallbacks] with no-op defaults */ -public interface ActivityLifecycleListener { - - /** - * Triggered when an activity is opened. - * - * @param activity details of the activity - */ - public fun onActivityStarted(activity: Activity) {} - - /** - * Triggered when an activity is closed. - * - * @param activity details of the activity - */ - public fun onActivityStopped(activity: Activity) {} - - /** - * Triggered when an activity is created. - * - * @param activity the activity - * @param bundle the bundle - */ - public fun onActivityCreated(activity: Activity, bundle: Bundle?) {} +public interface ActivityLifecycleListener : ActivityLifecycleCallbacks { + + override public fun onActivityCreated(activity: Activity, bundle: Bundle?) {} + + override public fun onActivityStarted(activity: Activity) {} + + override public fun onActivityResumed(activity: Activity) {} + + override public fun onActivityPaused(activity: Activity) {} + + override public fun onActivityStopped(activity: Activity) {} + + override public fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + + override public fun onActivityDestroyed(activity: Activity) {} } From de57070f8a72cd12f4627adde987b43a756a0dc9 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Thu, 25 Jul 2024 11:34:58 -0700 Subject: [PATCH 2/2] Rebase --- .../session/lifecycle/ActivityLifecycleListener.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt index deddf05a4f..52d8d668ab 100644 --- a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt +++ b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt @@ -9,17 +9,17 @@ import android.os.Bundle */ public interface ActivityLifecycleListener : ActivityLifecycleCallbacks { - override public fun onActivityCreated(activity: Activity, bundle: Bundle?) {} + public override fun onActivityCreated(activity: Activity, bundle: Bundle?) {} - override public fun onActivityStarted(activity: Activity) {} + public override fun onActivityStarted(activity: Activity) {} - override public fun onActivityResumed(activity: Activity) {} + public override fun onActivityResumed(activity: Activity) {} - override public fun onActivityPaused(activity: Activity) {} + public override fun onActivityPaused(activity: Activity) {} - override public fun onActivityStopped(activity: Activity) {} + public override fun onActivityStopped(activity: Activity) {} - override public fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + public override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} - override public fun onActivityDestroyed(activity: Activity) {} + public override fun onActivityDestroyed(activity: Activity) {} }