Clean up options menu code

Replaces permission check code with checkAppPermissions function.
WSDOT · Jan 31, 2022 · 7021398 · 7021398
1 parent de21a71
commit 7021398
Showing 1 changed file with 4 additions and 24 deletions.
diff --git a/app/src/main/java/gov/wa/wsdot/android/wsdot/ui/trafficmap/TrafficMapFragment.kt b/app/src/main/java/gov/wa/wsdot/android/wsdot/ui/trafficmap/TrafficMapFragment.kt
@@ -275,35 +275,15 @@ class TrafficMapFragment : DaggerFragment(), Injectable, OnMapReadyCallback,
         when (item.itemId) {
             R.id.action_my_location -> {
                 myLocationFineWithPermissionCheck()
-                if (activity?.let {
-                        ContextCompat.checkSelfPermission(
-                            it,
-                            Manifest.permission.ACCESS_FINE_LOCATION)
-                    }
-                    == PackageManager.PERMISSION_GRANTED) {
-                    myLocationFineWithPermissionCheck()
-                }
-                else if (activity?.let {
-                        ContextCompat.checkSelfPermission(
-                            it,
-                            Manifest.permission.ACCESS_COARSE_LOCATION)
-                    }
-                    == PackageManager.PERMISSION_GRANTED) {
-                    myLocationCoarseWithPermissionCheck()
-                }
-            }
-            else -> {
-                locationPermissionRequest.launch(
-                    arrayOf(
-                        Manifest.permission.ACCESS_FINE_LOCATION,
-                        Manifest.permission.ACCESS_COARSE_LOCATION
-                    )
-                )
+                checkAppPermissions()
             }
         }
+
         return false
+
     }
 
+
     override fun onMapReady(map: GoogleMap) {
 
         mMap = map as GoogleMap