From c0a5c4dd3cd26df7c2c181be23c6c2ce3fc26022 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sat, 8 Jan 2022 16:43:52 -0300
Subject: [PATCH] no permissions needed if hasCompanionDeviceApi

---
 .../geeksville/mesh/ui/SettingsFragment.kt    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index ce5b6dd8b..9842dcdd9 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -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()
+                    }
                 }
             }
         }