meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

better dialog for background location

Browse source
This commit is contained in:
Kevin Hester 2021-06-23 12:17:06 -07:00
parent c5fc6bc319
commit 74f7281a60
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -249,7 +249,7 @@ class MainActivity : AppCompatActivity(), Logging,
/** Ask the user to grant background location permission */
fun requestBackgroundPermission() = requestPermission(getBackgroundPermissions())
fun requestBackgroundPermission() = requestPermission(getBackgroundPermissions(), false)
/**
* @return a localized string warning user about missing permissions. Or null if everything is find
@ -280,10 +280,11 @@ class MainActivity : AppCompatActivity(), Logging,
}
/** Possibly prompt user to grant permissions
* @param shouldShowDialog usually true, but in cases where we've already shown a dialog elsewhere we skip it.
*
* @return true if we already have the needed permissions
*/
private fun requestPermission(missingPerms: List<String> = getMinimumPermissions()): Boolean =
private fun requestPermission(missingPerms: List<String> = getMinimumPermissions(), shouldShowDialog: Boolean = true): Boolean =
if (missingPerms.isNotEmpty()) {
val shouldShow = missingPerms.filter {
ActivityCompat.shouldShowRequestPermissionRationale(this, it)
@ -299,7 +300,7 @@ class MainActivity : AppCompatActivity(), Logging,
)
}
if (shouldShow.isNotEmpty()) {
if (shouldShow.isNotEmpty() && shouldShowDialog) {
// DID_REQUEST_PERM is an
// app-defined int constant. The callback method gets the
// result of the request.
@ -308,10 +309,10 @@ class MainActivity : AppCompatActivity(), Logging,
MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.required_permissions))
.setMessage(getMissingMessage())
.setNeutralButton("Cancel (no radio access)") { _, _ ->
.setNeutralButton(R.string.cancel_no_radio) { _, _ ->
error("User bailed due to permissions")
}
.setPositiveButton("Allow (will show dialog)") { _, _ ->
.setPositiveButton(R.string.allow_will_show) { _, _ ->
doRequest()
}
.show()