mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-04 14:13:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

warn repeatedly about missing permissions

Browse Source
This commit is contained in:
Kevin Hester
2021-05-10 08:09:42 +08:00
parent 0c7dac8cb2
commit b14061e6cc
4 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -291,8 +291,10 @@ class MainActivity : AppCompatActivity(), Logging,
/**
* Remind user he's disabled permissions we need
*
* @return true if we did warn
*/
private fun warnMissingPermissions() {
fun warnMissingPermissions(): Boolean {
// Older versions of android don't know about these permissions - ignore failure to grant
val ignoredPermissions = setOf(
Manifest.permission.ACCESS_COARSE_LOCATION,
@@ -304,10 +306,12 @@ class MainActivity : AppCompatActivity(), Logging,
!ignoredPermissions.contains(name)
}
if (deniedPermissions.isNotEmpty()) {
return if (deniedPermissions.isNotEmpty()) {
errormsg("Denied permissions: ${deniedPermissions.joinToString(",")}")
showToast(R.string.permission_missing)
}
true
} else
false
}
override fun onRequestPermissionsResult(
@@ -1133,7 +1137,8 @@ class MainActivity : AppCompatActivity(), Logging,
val styles = arrayOf(
getString(R.string.theme_light),
getString(R.string.theme_dark),
getString(R.string.theme_system))
getString(R.string.theme_system)
)
/// Load preferences and its value
val prefs = UIViewModel.getPreferences(this)

49
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -889,8 +889,22 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
val locationSettingsResponse = LocationServices.getSettingsClient(requireActivity())
.checkLocationSettings(builder.build())
fun weNeedAccess() {
context?.let { c ->
warn("Telling user we need need location accesss")
Toast.makeText(
c,
getString(R.string.location_disabled_warning),
Toast.LENGTH_SHORT
).show()
}
}
locationSettingsResponse.addOnSuccessListener {
debug("We have location access")
if(!it.locationSettingsStates.isBleUsable || !it.locationSettingsStates.isLocationUsable)
weNeedAccess()
else
debug("We have location access")
}
locationSettingsResponse.addOnFailureListener { _ ->
@@ -910,13 +924,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
// For now just punt and show a dialog
// The context might be gone (if activity is going away) by the time this handler is called
context?.let { c ->
Toast.makeText(
c,
getString(R.string.location_disabled_warning),
Toast.LENGTH_SHORT
).show()
}
weNeedAccess()
//} else
// Exceptions.report(exception)
@@ -945,20 +953,25 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
if (!hasCompanionDeviceApi)
scanModel.startScan()
requireActivity().registerReceiver(updateProgressReceiver, updateProgressFilter)
val activity = requireActivity() as MainActivity
activity.registerReceiver(updateProgressReceiver, updateProgressFilter)
// Keep reminding user BLE is still off
val hasUSB = activity?.let { SerialInterface.findDrivers(it).isNotEmpty() } ?: true
if (!hasUSB) {
// Warn user if BLE is disabled
if (scanModel.bluetoothAdapter?.isEnabled != true) {
Toast.makeText(
requireContext(),
R.string.error_bluetooth,
Toast.LENGTH_SHORT
).show()
} else {
checkLocationEnabled()
// First warn about permissions, and then if needed warn abotu settings
if(!activity.warnMissingPermissions()) {
// Warn user if BLE is disabled
if (scanModel.bluetoothAdapter?.isEnabled != true) {
Toast.makeText(
requireContext(),
R.string.error_bluetooth,
Toast.LENGTH_SHORT
).show()
} else {
checkLocationEnabled()
}
}
}
}