From ba919201540795c3d0fbb1698eaef4726a6e2631 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sat, 25 Apr 2020 07:33:51 -0700
Subject: [PATCH] fix autobug: if user has location disabled, warn that we
 can't provide it to mesh

---
 .../geeksville/mesh/service/MeshService.kt    | 21 +++++++++++++------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index c624d3063..cd890bd80 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -10,6 +10,7 @@ import android.graphics.Color
 import android.os.Build
 import android.os.IBinder
 import android.os.RemoteException
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.annotation.UiThread
 import androidx.core.app.NotificationCompat
@@ -22,6 +23,7 @@ import com.geeksville.android.ServiceClient
 import com.geeksville.mesh.*
 import com.geeksville.mesh.MeshProtos.MeshPacket
 import com.geeksville.mesh.MeshProtos.ToRadio
+import com.geeksville.mesh.R
 import com.geeksville.util.*
 import com.google.android.gms.common.api.ResolvableApiException
 import com.google.android.gms.location.*
@@ -174,6 +176,14 @@ class MeshService : Service(), Logging {
 
     private var fusedLocationClient: FusedLocationProviderClient? = null
 
+    private fun warnUserAboutLocation() {
+        Toast.makeText(
+            this,
+            getString(R.string.location_disabled),
+            Toast.LENGTH_LONG
+        ).show()
+    }
+
     /**
      * start our location requests (if they weren't already running)
      *
@@ -202,18 +212,17 @@ class MeshService : Service(), Logging {
             locationSettingsResponse.addOnFailureListener { exception ->
                 errormsg("Failed to listen to GPS")
                 if (exception is ResolvableApiException) {
-                    Exceptions.report(exception) // FIXME, not yet implemented, report failure to mothership
+                    // Exceptions.report(exception) // FIXME, not yet implemented, report failure to mothership
                     exceptionReporter {
                         // Location settings are not satisfied, but this can be fixed
                         // by showing the user a dialog.
 
-                        // FIXME
                         // Show the dialog by calling startResolutionForResult(),
                         // and check the result in onActivityResult().
-                        /* exception.startResolutionForResult(
-                            this@MainActivity,
-                            REQUEST_CHECK_SETTINGS
-                        ) */
+                        // exception.startResolutionForResult(this@MainActivity, REQUEST_CHECK_SETTINGS)
+
+                        // For now just punt and show a dialog
+                        warnUserAboutLocation()
                     }
                 } else
                     Exceptions.report(exception)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6bfb66312..c63987a16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,4 +48,5 @@
     <string name="please_pair">Please pair device in Android Settings.</string>
     <string name="pairing_completed">Pairing completed, starting service</string>
     <string name="pairing_failed_try_again">Pairing failed, please select again</string>
+    <string name="location_disabled">Location access is disabled, can not provide position to the mesh.</string>
 </resources>