From e077e6c2be2d65ec9091bc6dd8e297b22b437981 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Thu, 11 Jul 2024 23:04:02 -0700 Subject: [PATCH] Rename methods in ActivityLifecycleListenerInterface to match lifecycle methods --- .../internal/capture/crumbs/EmbraceBreadcrumbService.kt | 4 ++-- .../internal/session/lifecycle/ActivityLifecycleListener.kt | 4 ++-- .../internal/session/lifecycle/ActivityLifecycleTracker.kt | 4 ++-- .../embracesdk/session/ActivityLifecycleTrackerTest.kt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crumbs/EmbraceBreadcrumbService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crumbs/EmbraceBreadcrumbService.kt index 7b5f2d71c2..13012fb405 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crumbs/EmbraceBreadcrumbService.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crumbs/EmbraceBreadcrumbService.kt @@ -96,7 +96,7 @@ internal class EmbraceBreadcrumbService( } } - override fun onView(activity: Activity) { + override fun onActivityStarted(activity: Activity) { if (configService.breadcrumbBehavior.isAutomaticActivityCaptureEnabled()) { logView(activity.javaClass.name, clock.now()) } @@ -105,7 +105,7 @@ internal class EmbraceBreadcrumbService( /** * Close all open fragments when the activity closes */ - override fun onViewClose(activity: Activity) { + override fun onActivityStopped(activity: Activity) { if (configService.breadcrumbBehavior.isAutomaticActivityCaptureEnabled()) { dataSourceModuleProvider()?.viewDataSource?.dataSource?.onViewClose() } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt index 062940a438..80fc092966 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleListener.kt @@ -13,14 +13,14 @@ internal interface ActivityLifecycleListener { * * @param activity details of the activity */ - fun onView(activity: Activity) {} + fun onActivityStarted(activity: Activity) {} /** * Triggered when an activity is closed. * * @param activity details of the activity */ - fun onViewClose(activity: Activity) {} + fun onActivityStopped(activity: Activity) {} /** * Triggered when an activity is created. diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleTracker.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleTracker.kt index 789605d31e..64027730fb 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleTracker.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/session/lifecycle/ActivityLifecycleTracker.kt @@ -77,7 +77,7 @@ internal class ActivityLifecycleTracker( updateStateWithActivity(activity) stream(listeners) { listener: ActivityLifecycleListener -> try { - listener.onView(activity) + listener.onActivityStarted(activity) } catch (ex: Exception) { logger.logWarning(ERROR_FAILED_TO_NOTIFY) logger.trackInternalError(InternalErrorType.ACTIVITY_LISTENER_FAIL, ex) @@ -104,7 +104,7 @@ internal class ActivityLifecycleTracker( override fun onActivityStopped(activity: Activity) { stream(listeners) { listener: ActivityLifecycleListener -> try { - listener.onViewClose(activity) + listener.onActivityStopped(activity) } catch (ex: Exception) { logger.logWarning(ERROR_FAILED_TO_NOTIFY) logger.trackInternalError(InternalErrorType.ACTIVITY_LISTENER_FAIL, ex) diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/session/ActivityLifecycleTrackerTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/session/ActivityLifecycleTrackerTest.kt index 9bb620d782..7af0f98b08 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/session/ActivityLifecycleTrackerTest.kt +++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/session/ActivityLifecycleTrackerTest.kt @@ -120,7 +120,7 @@ internal class ActivityLifecycleTrackerTest { activityLifecycleTracker.onActivityStarted(mockActivity) - verify { mockActivityLifecycleListener.onView(mockActivity) } + verify { mockActivityLifecycleListener.onActivityStarted(mockActivity) } assertEquals(mockActivity, activityLifecycleTracker.foregroundActivity) } @@ -152,7 +152,7 @@ internal class ActivityLifecycleTrackerTest { activityLifecycleTracker.onActivityStopped(mockActivity) - verify { mockActivityLifecycleListener.onViewClose(mockActivity) } + verify { mockActivityLifecycleListener.onActivityStopped(mockActivity) } } @Test