Fix location setting off dialog

OneBusAway · Jun 24, 2015 · a382ffe · a382ffe
1 parent 86c4722
commit a382ffe
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/...away-android/src/amazon/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java b/...away-android/src/amazon/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java
@@ -52,6 +52,7 @@
 import org.onebusaway.android.map.StopMapController;
 import org.onebusaway.android.region.ObaRegionsTask;
 import org.onebusaway.android.util.LocationHelper;
+import org.onebusaway.android.util.LocationUtil;
 import org.onebusaway.android.util.UIHelp;
 
 import android.app.Dialog;
@@ -480,6 +481,11 @@ public void run() {
     @Override
     @SuppressWarnings("deprecation")
     public void setMyLocation(boolean useDefaultZoom, boolean animateToLocation) {
+        if (!LocationUtil.isLocationEnabled(getActivity()) && mRunning && UIHelp.canDisplayDialog(getActivity())) {
+            showDialog(MapDialogFragment.NOLOCATION_DIALOG);
+            return;
+        }
+
         Location lastLocation = Application.getLastKnownLocation(this.getActivity(), null);
         if (lastLocation == null) {
             Toast.makeText(getActivity(),

diff --git a/...away-android/src/google/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java b/...away-android/src/google/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java
@@ -41,6 +41,7 @@
 import org.onebusaway.android.map.StopMapController;
 import org.onebusaway.android.region.ObaRegionsTask;
 import org.onebusaway.android.util.LocationHelper;
+import org.onebusaway.android.util.LocationUtil;
 import org.onebusaway.android.util.UIHelp;
 
 import android.app.Dialog;
@@ -469,6 +470,11 @@ public void run() {
     @Override
     @SuppressWarnings("deprecation")
     public void setMyLocation(boolean useDefaultZoom, boolean animateToLocation) {
+        if (!LocationUtil.isLocationEnabled(getActivity()) && mRunning && UIHelp.canDisplayDialog(getActivity())) {
+            showDialog(MapDialogFragment.NOLOCATION_DIALOG);
+            return;
+        }
+
         Location lastLocation = Application.getLastKnownLocation(this.getActivity(), null);
         if (lastLocation == null) {
             Toast.makeText(getActivity(),

diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/util/LocationUtil.java b/onebusaway-android/src/main/java/org/onebusaway/android/util/LocationUtil.java
@@ -27,6 +27,8 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.concurrent.TimeUnit;
@@ -132,6 +134,35 @@ public static boolean fuzzyEquals(Location a, Location b) {
         return a.distanceTo(b) <= FUZZY_EQUALS_THRESHOLD;
     }
 
+    /**
+     * Returns true if the user has enabled location services on their device, false if they have
+     * not
+     *
+     * from http://stackoverflow.com/a/22980843/937715
+     *
+     * @return true if the user has enabled location services on their device, false if they have
+     * not
+     */
+    public static boolean isLocationEnabled(Context context) {
+        int locationMode = Settings.Secure.LOCATION_MODE_OFF;
+        String locationProviders;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            try {
+                locationMode = Settings.Secure
+                        .getInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE);
+            } catch (Settings.SettingNotFoundException e) {
+                e.printStackTrace();
+                return false;
+            }
+            return locationMode != Settings.Secure.LOCATION_MODE_OFF;
+        } else {
+            locationProviders = Settings.Secure.getString(context.getContentResolver(),
+                    Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
+            return !TextUtils.isEmpty(locationProviders);
+        }
+    }
+
     /**
      * Returns the human-readable details of a Location (provider, lat/long, accuracy, timestamp)
      *