Improved closeNotificationDrawerIfOpened

getodk · Sep 5, 2024 · e3ee0ca · e3ee0ca
1 parent cd6ec74
commit e3ee0ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/NotificationDrawer.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/NotificationDrawer.kt
@@ -158,9 +158,8 @@ class NotificationDrawer {
      */
     private fun closeNotificationDrawerIfOpened() {
         val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        device.wait(Until.hasObject(By.text("Manage")), TimeInMs.ONE_SECOND)
-        val manageButton = device.findObject(By.text("Manage"))
-        if (manageButton != null) {
+        val isManageButtonGone = device.wait(Until.gone(By.text("Manage")), TimeInMs.THREE_SECONDS)
+        if (!isManageButtonGone) {
             device.pressBack()
         }
     }

diff --git a/shared/src/main/java/org/odk/collect/shared/TimeInMs.kt b/shared/src/main/java/org/odk/collect/shared/TimeInMs.kt
@@ -2,6 +2,7 @@ package org.odk.collect.shared
 
 object TimeInMs {
     const val ONE_SECOND = 1000L
+    const val THREE_SECONDS = 3000L
     const val ONE_MINUTE = 60000L
     const val ONE_HOUR = 3600000L
     const val ONE_DAY = 86400000L