added AppStartMetrics.registerApplicationForegroundCheck in the Sentr…

…yPerformanceProvider, other than AppStartMetrics.onApplicationCreate

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

@@ -446,6 +446,7 @@ public class io/sentry/android/core/performance/AppStartMetrics : io/sentry/andr
 	public static fun onApplicationPostCreate (Landroid/app/Application;)V
 	public static fun onContentProviderCreate (Landroid/content/ContentProvider;)V
 	public static fun onContentProviderPostCreate (Landroid/content/ContentProvider;)V
+	public fun registerApplicationForegroundCheck (Landroid/app/Application;)V
 	public fun setAppLaunchedInForeground (Z)V
 	public fun setAppStartProfiler (Lio/sentry/ITransactionProfiler;)V
 	public fun setAppStartSamplingDecision (Lio/sentry/TracesSamplingDecision;)V

sentry-android-core/src/main/java/io/sentry/android/core/SentryPerformanceProvider.java

@@ -201,6 +201,7 @@ private void onAppLaunched(
 
     final @NotNull TimeSpan appStartTimespan = appStartMetrics.getAppStartTimeSpan();
     appStartTimespan.setStartedAt(Process.getStartUptimeMillis());
+    appStartMetrics.registerApplicationForegroundCheck(app);
 
     final AtomicBoolean firstDrawDone = new AtomicBoolean(false);
 

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

@@ -223,20 +223,29 @@ public static void onApplicationCreate(final @NotNull Application application) {
     final @NotNull AppStartMetrics instance = getInstance();
     if (instance.applicationOnCreate.hasNotStarted()) {
       instance.applicationOnCreate.setStartedAt(now);
-      application.registerActivityLifecycleCallbacks(instance);
       instance.appLaunchedInForeground =
           instance.appLaunchedInForeground || ContextUtils.isForegroundImportance();
-      new Handler(Looper.getMainLooper())
-          .post(
-              () -> {
-                // if no activity has ever been created, app was launched in background
-                if (instance.onCreateTime == null) {
-                  instance.appLaunchedInForeground = false;
-                }
-              });
+      instance.registerApplicationForegroundCheck(application);
     }
   }
 
+  /**
+   * Register a callback to check if an activity was started after the application was created
+   *
+   * @param application The application object to register the callback to
+   */
+  public void registerApplicationForegroundCheck(final @NotNull Application application) {
+    application.registerActivityLifecycleCallbacks(instance);
+    new Handler(Looper.getMainLooper())
+        .post(
+            () -> {
+              // if no activity has ever been created, app was launched in background
+              if (onCreateTime == null) {
+                appLaunchedInForeground = false;
+              }
+            });
+  }
+
   @Override
   public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
     // An activity already called onCreate()

sentry-android-core/src/test/java/io/sentry/android/core/SentryPerformanceProviderTest.kt

@@ -18,6 +18,7 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.robolectric.annotation.Config
@@ -164,7 +165,8 @@ class SentryPerformanceProviderTest {
     fun `provider properly registers and unregisters ActivityLifecycleCallbacks`() {
         val provider = fixture.getSut()
 
-        verify(fixture.mockContext).registerActivityLifecycleCallbacks(any())
+        // It register once for the provider itself and once for the appStartMetrics
+        verify(fixture.mockContext, times(2)).registerActivityLifecycleCallbacks(any())
         provider.onAppStartDone()
         verify(fixture.mockContext).unregisterActivityLifecycleCallbacks(any())
     }