fix(espresso): fix tests relating to to new background location permi…

…ssion prompt

project/app/src/androidTest/java/org/owntracks/android/testutils/Helpers.kt

@@ -45,6 +45,7 @@ import junit.framework.AssertionFailedError
 import kotlin.random.Random
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
+import kotlinx.datetime.Clock
 import org.hamcrest.Matcher
 import org.owntracks.android.R
 import org.owntracks.android.preferences.Preferences
@@ -209,7 +210,11 @@ fun grantNotificationAndForegroundPermissions() {
 /** Who knows what order these will appear in. */
 fun grantMapActivityPermissions() {
   grantNotificationAndForegroundPermissions()
-  clickDialogNegativeButton()
+  // Wait for the dialog to appear
+  if (Build.VERSION.SDK_INT >= 29) {
+    waitUntilVisible(onView(withId(android.R.id.button2)))
+    clickDialogNegativeButton()
+  }
 }
 
 /**
@@ -317,3 +322,26 @@ fun getText(matcher: ViewInteraction): String {
 
   return text
 }
+
+fun waitUntilVisible(matcher: ViewInteraction, timeout: Duration = 1.seconds) {
+  matcher.perform(
+      object : ViewAction {
+        override fun getConstraints(): Matcher<View> {
+          return ViewMatchers.isAssignableFrom(TextView::class.java)
+        }
+
+        override fun getDescription(): String {
+          return "Wait until this is visible"
+        }
+
+        override fun perform(uiController: UiController, view: View) {
+          val endTime = Clock.System.now().plus(timeout)
+          do {
+            if (view.visibility == View.VISIBLE) {
+              return
+            }
+            uiController.loopMainThreadUntilIdle()
+          } while (Clock.System.now() < endTime)
+        }
+      })
+}

project/app/src/androidTestGms/java/org/owntracks/android/ui/map/GMSMapActivityTests.kt

@@ -72,15 +72,15 @@ class GMSMapActivityTests : TestWithAnActivity<MapActivity>(MapActivity::class.j
   }
 
   @Test
-  fun welcomeActivityShouldNotRunWhenFirstStartPreferencesSet() {
+  fun welcomeActivityWhenFirstStartPreferencesSetShouldNotRun() {
     setNotFirstStartPreferences()
     launchActivity()
     grantMapActivityPermissions()
     assertDisplayed(R.id.google_map_view)
   }
 
   @Test
-  fun mapActivityShouldPromptForLocationServicesOnFirstTime() {
+  fun mapActivityWhenRunForFirstTimePromptsForLocationServices() {
     try {
       disableDeviceLocation()
       setNotFirstStartPreferences()

project/app/src/main/java/org/owntracks/android/ui/map/MapActivity.kt

@@ -359,33 +359,27 @@ class MapActivity :
       Timber.d("Location Services disabled")
       if ((explicitUserAction || !preferences.userDeclinedEnableLocationServices)) {
         Timber.d("Showing location services dialog")
-        if (!this::locationServicesAlertDialog.isInitialized) {
-          locationServicesAlertDialog =
-              MaterialAlertDialogBuilder(this)
-                  .setCancelable(true)
-                  .setIcon(R.drawable.ic_baseline_location_disabled_24)
-                  .setTitle(getString(R.string.deviceLocationDisabledDialogTitle))
-                  .setMessage(getString(R.string.deviceLocationDisabledDialogMessage))
-                  .setPositiveButton(
-                      getString(R.string.deviceLocationDisabledDialogPositiveButtonLabel)) { _, _ ->
-                        locationServicesLauncher.launch(
-                            Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
-                      }
-                  .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    preferences.userDeclinedEnableLocationServices = true
-                  }
-                  .create()
-        }
-        if (!locationServicesAlertDialog.isShowing) {
-          locationServicesAlertDialog.show()
-        }
+        MaterialAlertDialogBuilder(this)
+            .setCancelable(true)
+            .setIcon(R.drawable.ic_baseline_location_disabled_24)
+            .setTitle(getString(R.string.deviceLocationDisabledDialogTitle))
+            .setMessage(getString(R.string.deviceLocationDisabledDialogMessage))
+            .setPositiveButton(
+                getString(R.string.deviceLocationDisabledDialogPositiveButtonLabel)) { _, _ ->
+                  locationServicesLauncher.launch(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
+                }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+              preferences.userDeclinedEnableLocationServices = true
+            }
+            .show()
       } else {
         Timber.d(
             "Not requesting location services. " +
                 "Explicit=false, previously declined=${preferences.userDeclinedEnableLocationServices}")
       }
       false
     } else {
+      Timber.d("Location services enabled")
       true
     }
   }
@@ -453,11 +447,17 @@ class MapActivity :
 
   /**
    * User has declined to enable background location permissions. Log this in the preferences so we
-   * don't keep asking
+   * don't keep asking.
+   *
+   * This may have been called by the user calling cancel on the material dialog in the onResume
+   * flow so we need to check for location services next
    */
   private fun backgroundLocationPermissionDenied() {
     Timber.d("Background location permission denied")
     preferences.userDeclinedEnableBackgroundLocationPermissions = true
+    if (checkAndRequestLocationServicesEnabled(false)) {
+      viewModel.requestLocationUpdatesForBlueDot()
+    }
   }
 
   enum class CheckPermissionsResult {
@@ -530,6 +530,25 @@ class MapActivity :
     }
   }
 
+  private fun checkAndRequestBackgroundLocationPermissions(): CheckPermissionsResult {
+    Timber.d("Checking and requesting background location permissions")
+    return if (!requirementsChecker.hasBackgroundLocationPermission()) {
+      Timber.d("No background location permission")
+      if (!preferences.userDeclinedEnableBackgroundLocationPermissions &&
+          Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        Timber.d("Requesting background location permissions")
+        backgroundLocationPermissionRequester.requestLocationPermissions(this) { true }
+        CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST
+      } else {
+        Timber.d("Not requesting background location permission")
+        CheckPermissionsResult.NO_PERMISSIONS_NOT_LAUNCHED_REQUEST
+      }
+    } else {
+      preferences.userDeclinedEnableBackgroundLocationPermissions = true
+      CheckPermissionsResult.HAS_PERMISSIONS
+    }
+  }
+
   override fun onResume() {
     val mapFragment =
         supportFragmentManager.fragmentFactory.instantiate(
@@ -544,34 +563,23 @@ class MapActivity :
     updateMonitoringModeMenu()
     viewModel.updateMyLocationStatus()
 
-    // Request Notification permissions
-    when (checkAndRequestNotificationPermissions()) {
-      CheckPermissionsResult.HAS_PERMISSIONS,
-      CheckPermissionsResult.NO_PERMISSIONS_NOT_LAUNCHED_REQUEST -> {
-        // Request Location permissions
-        when (checkAndRequestLocationPermissions(false)) {
-          CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST -> {
-            Timber.d("Launched location permission request")
-          }
-          CheckPermissionsResult.NO_PERMISSIONS_NOT_LAUNCHED_REQUEST -> {
-            Timber.d("No location permissions, not launched request")
-          }
-          CheckPermissionsResult.HAS_PERMISSIONS -> {
-            Timber.d("Has location permissions")
-            if (checkAndRequestLocationServicesEnabled(false)) {
-              viewModel.requestLocationUpdatesForBlueDot()
-              // Request background location permissions if needed
-              if (!requirementsChecker.hasBackgroundLocationPermission() &&
-                  Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
-                  !preferences.userDeclinedEnableBackgroundLocationPermissions) {
-                backgroundLocationPermissionRequester.requestLocationPermissions(this) { true }
-              }
-            }
-          }
-        }
-      }
-      CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST ->
-          Timber.d("Launched notification permission request, not asking for location permissions")
+    if (checkAndRequestNotificationPermissions() ==
+        CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST) {
+      Timber.d("Launched notification permission request")
+      return
+    }
+    if (checkAndRequestLocationPermissions(false) ==
+        CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST) {
+      Timber.d("Launched location permission request")
+      return
+    }
+    if (checkAndRequestBackgroundLocationPermissions() ==
+        CheckPermissionsResult.NO_PERMISSIONS_LAUNCHED_REQUEST) {
+      Timber.d("Launched background location permission request")
+      return
+    }
+    if (checkAndRequestLocationServicesEnabled(false)) {
+      viewModel.requestLocationUpdatesForBlueDot()
     }
   }
 

project/app/src/main/java/org/owntracks/android/ui/mixins/BackgroundLocationPermissionRequester.kt

@@ -37,7 +37,7 @@ class BackgroundLocationPermissionRequester(
       // The user may have denied us once already, so show a rationale
       Timber.d("Showing Background Location permission rationale")
       MaterialAlertDialogBuilder(context)
-          .setCancelable(true)
+          .setCancelable(false)
           .setIcon(R.drawable.baseline_share_location_24)
           .setTitle(R.string.backgroundLocationPermissionRequestDialogTitle)
           .setMessage(R.string.backgroundLocationPermissionRequestDialogText)