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

no permissions needed if hasCompanionDeviceApi

Browse Source
This commit is contained in:
andrekir
2022-01-08 16:43:52 -03:00
parent d0614c7934
commit c0a5c4dd3c
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,7 +559,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
val statusText = binding.scanStatusText
val permissionsWarning = myActivity.getMissingMessage()
when {
permissionsWarning != null ->
(!hasCompanionDeviceApi && permissionsWarning != null) ->
statusText.text = permissionsWarning
region == RadioConfigProtos.RegionCode.Unset ->
@@ -927,17 +927,18 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
// Keep reminding user BLE is still off
val hasUSB = SerialInterface.findDrivers(myActivity).isNotEmpty()
if (!hasUSB) {
// First warn about permissions, and then if needed warn about settings
if (!myActivity.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()
// Warn user if BLE is disabled
if (scanModel.bluetoothAdapter?.isEnabled != true) {
Toast.makeText(
requireContext(),
R.string.error_bluetooth,
Toast.LENGTH_SHORT
).show()
} else {
if (!hasCompanionDeviceApi) {
if (!myActivity.warnMissingPermissions()) {
checkLocationEnabled()
}
}
}
}