Skip to content

Commit 31d9b25

Browse files
committed
changed AppStartMetrics to use ActivityLifecycleCallbacksAdapter
added app launch foreground check to AppStartMetrics ctor
1 parent c2b6daa commit 31d9b25

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

sentry-android-core/api/sentry-android-core.api

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public class io/sentry/android/core/performance/ActivityLifecycleTimeSpan : java
425425
public final fun getOnStart ()Lio/sentry/android/core/performance/TimeSpan;
426426
}
427427

428-
public class io/sentry/android/core/performance/AppStartMetrics : android/app/Application$ActivityLifecycleCallbacks {
428+
public class io/sentry/android/core/performance/AppStartMetrics : io/sentry/android/core/performance/ActivityLifecycleCallbacksAdapter {
429429
public fun <init> ()V
430430
public fun addActivityLifecycleTimeSpans (Lio/sentry/android/core/performance/ActivityLifecycleTimeSpan;)V
431431
public fun clear ()V
@@ -442,12 +442,6 @@ public class io/sentry/android/core/performance/AppStartMetrics : android/app/Ap
442442
public fun getSdkInitTimeSpan ()Lio/sentry/android/core/performance/TimeSpan;
443443
public fun isAppLaunchedInForeground ()Z
444444
public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
445-
public fun onActivityDestroyed (Landroid/app/Activity;)V
446-
public fun onActivityPaused (Landroid/app/Activity;)V
447-
public fun onActivityResumed (Landroid/app/Activity;)V
448-
public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
449-
public fun onActivityStarted (Landroid/app/Activity;)V
450-
public fun onActivityStopped (Landroid/app/Activity;)V
451445
public static fun onApplicationCreate (Landroid/app/Application;)V
452446
public static fun onApplicationPostCreate (Landroid/app/Application;)V
453447
public static fun onContentProviderCreate (Landroid/content/ContentProvider;)V

sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* transformed into SDK specific txn/span data structures.
3333
*/
3434
@ApiStatus.Internal
35-
public class AppStartMetrics implements Application.ActivityLifecycleCallbacks {
35+
public class AppStartMetrics extends ActivityLifecycleCallbacksAdapter {
3636

3737
public enum AppStartType {
3838
UNKNOWN,
@@ -76,6 +76,7 @@ public AppStartMetrics() {
7676
applicationOnCreate = new TimeSpan();
7777
contentProviderOnCreates = new HashMap<>();
7878
activityLifecycles = new ArrayList<>();
79+
appLaunchedInForeground = ContextUtils.isForegroundImportance();
7980
}
8081

8182
/**
@@ -223,7 +224,8 @@ public static void onApplicationCreate(final @NotNull Application application) {
223224
if (instance.applicationOnCreate.hasNotStarted()) {
224225
instance.applicationOnCreate.setStartedAt(now);
225226
application.registerActivityLifecycleCallbacks(instance);
226-
instance.appLaunchedInForeground = ContextUtils.isForegroundImportance();
227+
instance.appLaunchedInForeground =
228+
instance.appLaunchedInForeground || ContextUtils.isForegroundImportance();
227229
new Handler(Looper.getMainLooper())
228230
.post(
229231
() -> {
@@ -255,24 +257,6 @@ public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle saved
255257
}
256258
}
257259

258-
@Override
259-
public void onActivityStarted(@NonNull Activity activity) {}
260-
261-
@Override
262-
public void onActivityResumed(@NonNull Activity activity) {}
263-
264-
@Override
265-
public void onActivityPaused(@NonNull Activity activity) {}
266-
267-
@Override
268-
public void onActivityStopped(@NonNull Activity activity) {}
269-
270-
@Override
271-
public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {}
272-
273-
@Override
274-
public void onActivityDestroyed(@NonNull Activity activity) {}
275-
276260
/**
277261
* Called by instrumentation
278262
*

0 commit comments

Comments
 (0)