Merge pull request #1312 from garvankeeley/1311-network-prov-not-avail

MapLocationListener: wrap requestLocUpdates to catch and ignore exceptions
mozilla · Nov 28, 2014 · 67b4a5f · 67b4a5f
2 parents 8fc7d0d + 35c9500
commit 67b4a5f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapLocationListener.java b/android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapLocationListener.java
@@ -13,6 +13,7 @@
 import android.os.Bundle;
 import android.widget.Toast;
 
+import org.mozilla.mozstumbler.service.AppGlobals;
 import org.mozilla.mozstumbler.service.stumblerthread.scanners.GPSScanner;
 
 import java.lang.ref.WeakReference;
@@ -120,11 +121,16 @@ private void enableLocationListener(boolean isEnabled, LocationUpdateListener li
             return;
         }
 
-        if (isEnabled && !listener.mIsActive) {
-            mLocationManager.requestLocationUpdates(listener.mType, listener.mFreqMs, 0, listener);
-        } else if (!isEnabled && listener.mIsActive) {
-            mLocationManager.removeUpdates(listener);
+        try {
+            if (isEnabled && !listener.mIsActive) {
+                mLocationManager.requestLocationUpdates(listener.mType, listener.mFreqMs, 0, listener);
+            } else if (!isEnabled && listener.mIsActive) {
+                mLocationManager.removeUpdates(listener);
+            }
+        } catch (IllegalArgumentException ex) {
+            AppGlobals.guiLogError("enableLocationListener failed");
         }
+
         listener.mIsActive = isEnabled;
     }