SentryFrameMetricsCollector start collecting frameMetrics in onActivityStarted(), not onActivityCreated() anymore

Author: stefanosiano

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/SentryFrameMetricsCollector.java

@@ -94,13 +94,15 @@ public SentryFrameMetricsCollector(
         };
   }
 
+  // addOnFrameMetricsAvailableListener internally calls Activity.getWindow().getDecorView(),
+  //  which cannot be called before setContentView. That's why we call it in onActivityStarted()
   @Override
-  public void onActivityCreated(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
-    setCurrentWindow(activity.getWindow());
-  }
+  public void onActivityCreated(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {}
 
   @Override
-  public void onActivityStarted(@NotNull Activity activity) {}
+  public void onActivityStarted(@NotNull Activity activity) {
+    setCurrentWindow(activity.getWindow());
+  }
 
   @Override
   public void onActivityResumed(@NotNull Activity activity) {}

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/SentryFrameMetricsCollectorTest.kt

@@ -130,7 +130,7 @@ class SentryFrameMetricsCollectorTest {
 
         collector.startCollection(mock())
         assertEquals(0, fixture.addOnFrameMetricsAvailableListenerCounter)
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         assertEquals(1, fixture.addOnFrameMetricsAvailableListenerCounter)
     }
 
@@ -139,7 +139,7 @@ class SentryFrameMetricsCollectorTest {
         val collector = fixture.getSut(context)
 
         collector.startCollection(mock())
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
         collector.onActivityStopped(fixture.activity)
         assertEquals(1, fixture.removeOnFrameMetricsAvailableListenerCounter)
@@ -151,7 +151,7 @@ class SentryFrameMetricsCollectorTest {
 
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
         assertEquals(0, fixture.addOnFrameMetricsAvailableListenerCounter)
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         collector.onActivityStopped(fixture.activity)
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
         assertEquals(0, fixture.addOnFrameMetricsAvailableListenerCounter)
@@ -161,7 +161,7 @@ class SentryFrameMetricsCollectorTest {
     fun `startCollection calls addOnFrameMetricsAvailableListener if an activity is already started`() {
         val collector = fixture.getSut(context)
 
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         assertEquals(0, fixture.addOnFrameMetricsAvailableListenerCounter)
         collector.startCollection(mock())
         assertEquals(1, fixture.addOnFrameMetricsAvailableListenerCounter)
@@ -171,7 +171,7 @@ class SentryFrameMetricsCollectorTest {
     fun `stopCollection calls removeOnFrameMetricsAvailableListener even if an activity is still started`() {
         val collector = fixture.getSut(context)
         val id = collector.startCollection(mock())
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
 
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
         collector.stopCollection(id)
@@ -186,8 +186,8 @@ class SentryFrameMetricsCollectorTest {
         assertEquals(0, fixture.addOnFrameMetricsAvailableListenerCounter)
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
 
-        collector.onActivityCreated(fixture.activity, mock())
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
+        collector.onActivityStarted(fixture.activity)
 
         collector.onActivityStopped(fixture.activity)
         collector.onActivityStopped(fixture.activity)
@@ -200,7 +200,7 @@ class SentryFrameMetricsCollectorTest {
     fun `stopCollection works only after startCollection`() {
         val collector = fixture.getSut(context)
         collector.startCollection(mock())
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         collector.stopCollection("testId")
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)
     }
@@ -209,8 +209,8 @@ class SentryFrameMetricsCollectorTest {
     fun `collector tracks multiple activities`() {
         val collector = fixture.getSut(context)
         collector.startCollection(mock())
-        collector.onActivityCreated(fixture.activity, mock())
-        collector.onActivityCreated(fixture.activity2, mock())
+        collector.onActivityStarted(fixture.activity)
+        collector.onActivityStarted(fixture.activity2)
         assertEquals(2, fixture.addOnFrameMetricsAvailableListenerCounter)
         collector.onActivityStopped(fixture.activity)
         collector.onActivityStopped(fixture.activity2)
@@ -222,7 +222,7 @@ class SentryFrameMetricsCollectorTest {
         val collector = fixture.getSut(context)
         val id1 = collector.startCollection(mock())
         val id2 = collector.startCollection(mock())
-        collector.onActivityCreated(fixture.activity, mock())
+        collector.onActivityStarted(fixture.activity)
         assertEquals(1, fixture.addOnFrameMetricsAvailableListenerCounter)
         collector.stopCollection(id1)
         assertEquals(0, fixture.removeOnFrameMetricsAvailableListenerCounter)