[Android] Fix JankStats memory leak due to picking Dialog window (#705)

* [Android] Fix JankStats memory leak due to picking Dialog window

* [Android] Fix JankStats memory leak due to picking Dialog window

* Iterate through all views and find first not destroyed activity

* Update docs

* Make sure to stop listener after initial ON_CREATE detection

* Add missing min sdk level for platform/jvm/common module

Author: FranAguilera

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/events/performance/JankStatsMonitor.kt

@@ -132,11 +132,11 @@ internal class JankStatsMonitor(
             return
         }
         if (event == Lifecycle.Event.ON_CREATE) {
-            windowManager.getCurrentWindow()?.let {
-                setJankStatsForCurrentWindow(it)
-                // We are done detecting initial Application ON_CREATE, we don't need to listen anymore
-                processLifecycleOwner.lifecycle.removeObserver(this)
+            windowManager.findFirstValidActivity()?.let {
+                setJankStatsForCurrentWindow(it.window)
             }
+            // We are done detecting initial Application ON_CREATE, we don't need to listen anymore
+            processLifecycleOwner.lifecycle.removeObserver(this)
         }
     }
 

platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/events/performance/JankStatsMonitorTest.kt

@@ -69,8 +69,7 @@ class JankStatsMonitorTest {
         window = activity.window
 
         whenever(processLifecycleOwner.lifecycle).thenReturn(lifecycle)
-        whenever(windowManager.getCurrentWindow()).thenReturn(window)
-        whenever(windowManager.getFirstRootView()).thenReturn(window.decorView)
+        whenever(windowManager.findFirstValidActivity()).thenReturn(activity)
 
         whenever(runtime.isEnabled(RuntimeFeature.DROPPED_EVENTS_MONITORING)).thenReturn(true)
         whenever(runtime.getConfigValue(RuntimeConfig.MIN_JANK_FRAME_THRESHOLD_MS)).thenReturn(16)

platform/jvm/common/build.gradle.kts

@@ -13,6 +13,11 @@ android {
 
     compileSdk = 36
 
+    defaultConfig {
+        minSdk = 23
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8

platform/jvm/common/src/main/kotlin/io/bitdrift/capture/common/IWindowManager.kt

@@ -7,20 +7,13 @@
 
 package io.bitdrift.capture.common
 
+import android.app.Activity
 import android.view.View
-import android.view.Window
 
 /**
  * Provides access the Global Window Views, or `null` if no window is available.
  */
 interface IWindowManager {
-    /**
-     * Returns the current [Window] if available.
-     *
-     * @return The current [Window], or `null` if no window is available.
-     */
-    fun getCurrentWindow(): Window?
-
     /**
      * Returns the root view of the current window if available.
      *
@@ -34,4 +27,16 @@ interface IWindowManager {
      * @return The root views of the current hierarchy, or an empty list if not available.
      */
     fun getAllRootViews(): List<View>
+
+    /**
+     * Finds the first valid (non-destroyed) activity from all available root views.
+     *
+     * For most cases, this returns the currently visible activity.
+     *
+     * When multiple activities are present (split-screen, PiP, etc), this returns
+     * the first valid activity found in the iteration order.
+     *
+     * @return The first valid [android.app.Activity], or `null` if none found
+     */
+    fun findFirstValidActivity(): Activity?
 }

platform/jvm/common/src/main/kotlin/io/bitdrift/capture/common/WindowManager.kt

@@ -7,9 +7,11 @@
 
 package io.bitdrift.capture.common
 
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
 import android.os.Build
 import android.view.View
-import android.view.Window
 import android.view.inspector.WindowInspector
 
 /**
@@ -25,8 +27,6 @@ class WindowManager(
         Class.forName("android.view.WindowManagerGlobal")
     }
 
-    override fun getCurrentWindow(): Window? = getFirstRootView()?.phoneWindow
-
     override fun getFirstRootView(): View? = getAllRootViews().firstOrNull()
 
     private val windowManagerGlobal: Any? by lazy(LazyThreadSafetyMode.NONE) {
@@ -61,4 +61,28 @@ class WindowManager(
             return emptyList()
         }
     }
+
+    override fun findFirstValidActivity(): Activity? =
+        getAllRootViews().firstNotNullOfOrNull { view ->
+            val activity = view.unwrapToActivity()
+            if (activity != null && !activity.isDestroyed) {
+                activity
+            } else {
+                null
+            }
+        }
+
+    private fun View.unwrapToActivity(): Activity? {
+        val visited = mutableSetOf<Context>()
+        var current: Context? = WindowSpy.pullWindow(this)?.context
+
+        while (current is ContextWrapper) {
+            if (current is Activity) return current
+            if (!visited.add(current)) {
+                return null
+            }
+            current = current.baseContext
+        }
+        return null
+    }
 }

platform/jvm/gradle-test-app/src/main/res/values/bools.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="leak_canary_watcher_watch_dismissed_dialogs">true</bool>
+</resources>