CodeRabbit fixes

Author: hal-eisen-adfa

app/src/androidTest/kotlin/com/itsaky/androidide/PermissionsInfoScreenTest.kt

@@ -52,17 +52,18 @@ class PermissionsInfoScreenTest : TestCase() {
         val root = InstrumentationRegistry.getInstrumentation().uiAutomation
             .rootInActiveWindow ?: return false
         val nodes = root.findAccessibilityNodeInfosByText(text)
-        for (node in nodes) {
-            if (node.text?.toString().equals(text, ignoreCase = true)) {
-                val result = node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
+        var result = false
+        try {
+            for (node in nodes) {
+                if (!result && node.text?.toString().equals(text, ignoreCase = true)) {
+                    result = node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
+                }
                 node.recycle()
-                root.recycle()
-                return result
             }
-            node.recycle()
+        } finally {
+            root.recycle()
         }
-        root.recycle()
-        return false
+        return result
     }
 
     @Test
@@ -101,7 +102,7 @@ class PermissionsInfoScreenTest : TestCase() {
     }
 
     @Test
-    fun test_privacyDialog_notShownOnSecondVisit() = run {
+    fun test_privacyDialog_dismissedAfterAccept() = run {
         step("Wait for app") {
             device.uiDevice.waitForIdle()
         }

app/src/androidTest/kotlin/com/itsaky/androidide/helper/GrantRequiredPermissionsUiHelper.kt

@@ -72,20 +72,22 @@ private fun clickFirstGrantButton() {
 
     val nodes = root.findAccessibilityNodeInfosByText(grantText)
     var clicked = false
-    for (node in nodes) {
-        if (node.text?.toString().equals(grantText, ignoreCase = true)
-            && node.isClickable
-            && node.isEnabled
-            && node.isVisibleToUser
-        ) {
-            node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
-            clicked = true
+    try {
+        for (node in nodes) {
+            if (!clicked
+                && node.text?.toString().equals(grantText, ignoreCase = true)
+                && node.isClickable
+                && node.isEnabled
+                && node.isVisibleToUser
+            ) {
+                node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
+                clicked = true
+            }
             node.recycle()
-            break
         }
-        node.recycle()
+    } finally {
+        root.recycle()
     }
-    root.recycle()
 
     if (!clicked) {
         throw AssertionError("No '$grantText' button found")

app/src/androidTest/kotlin/com/itsaky/androidide/helper/OnboardingPermissionsInfoHelper.kt

@@ -36,27 +36,35 @@ fun TestContext<Unit>.passPermissionsInfoSlideWithPrivacyDialog() {
         }
     }
     step("Continue from permissions information slide") {
-        flakySafely(timeoutMs = 3_000) {
-            // The Next button is in the system gesture exclusion zone. Use accessibility
-            // ACTION_CLICK to bypass coordinate-based touch injection.
-            val root = InstrumentationRegistry.getInstrumentation().uiAutomation
-                .rootInActiveWindow
-                ?: throw AssertionError("No active window for accessibility")
-            val nodes = root.findAccessibilityNodeInfosByText("NEXT")
-            var clicked = false
+        // After dismissing the dialog, the accessibility tree transitions from 2 windows
+        // to 1. Use UIAutomator's waitForExists (which handles window transitions) to
+        // wait for the NEXT button to become reachable, then click via accessibility.
+        val d = device.uiDevice
+        val nextObj = d.findObject(UiSelector().descriptionContains("NEXT"))
+        if (!nextObj.waitForExists(3_000)) {
+            throw AssertionError("NEXT button not found on permissions info slide")
+        }
+
+        val uiAutomation = InstrumentationRegistry.getInstrumentation().uiAutomation
+        val root = uiAutomation.rootInActiveWindow
+            ?: throw AssertionError("No active window for accessibility")
+        val nodes = root.findAccessibilityNodeInfosByText("NEXT")
+        var clicked = false
+        try {
             for (node in nodes) {
-                if (node.contentDescription?.toString()?.contains("NEXT", ignoreCase = true) == true) {
+                val desc = node.contentDescription?.toString() ?: ""
+                val text = node.text?.toString() ?: ""
+                if (!clicked && (desc.contains("NEXT", ignoreCase = true) || text.contains("NEXT", ignoreCase = true))) {
                     clicked = node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
-                    node.recycle()
-                    break
                 }
                 node.recycle()
             }
+        } finally {
             root.recycle()
-            if (!clicked) {
-                throw AssertionError("NEXT button not found on permissions info slide")
-            }
-            device.uiDevice.waitForIdle()
         }
+        if (!clicked) {
+            throw AssertionError("NEXT button found by UIAutomator but accessibility click failed")
+        }
+        d.waitForIdle()
     }
 }