Don't crash when "Allow mock locations" is not enabled.

FlorianUekermann · Feb 27, 2015 · b4a2460 · b4a2460
1 parent 0c39b80
commit b4a2460
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/app/src/main/java/github/luv/mockgeofix/MockLocationProvider.java b/app/src/main/java/github/luv/mockgeofix/MockLocationProvider.java
@@ -4,6 +4,7 @@
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Bundle;
+import android.util.Log;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -61,9 +62,13 @@ protected void _init(Context context) {
 
     protected void _register() {
         // if the test provider already exists, android handles this fine
-        mLocationManager.addTestProvider(locationProviderName, false, false, false,
-                false, true, true, true, 0, accuracy);
-        mLocationManager.setTestProviderEnabled(locationProviderName, true);
+        try {
+            mLocationManager.addTestProvider(locationProviderName, false, false, false,
+                    false, true, true, true, 0, accuracy);
+            mLocationManager.setTestProviderEnabled(locationProviderName, true);
+        } catch (IllegalArgumentException ex) {
+            Log.e(TAG, "IllegalArgumentException thrown in _register");
+        }
     }
 
     protected void _unregister() {

diff --git a/app/src/main/java/github/luv/mockgeofix/MockLocationService.java b/app/src/main/java/github/luv/mockgeofix/MockLocationService.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
@@ -198,6 +199,10 @@ public void run() {
             } catch (SecurityException ex) {
                 Log.e(TAG, "WakeLock not acquired - permission denied for WakeLock.");
             }
+            if ( mContext.checkCallingOrSelfPermission("android.permission.ACCESS_MOCK_LOCATION")
+                  != PackageManager.PERMISSION_GRANTED) {
+                throw new SecurityException("Permission denied for android.permission.ACCESS_MOCK_LOCATION");
+            }
             MockLocationProvider.register();
             mService.threadHasStartedSuccessfully();
 
@@ -231,6 +236,9 @@ public void run() {
             }
         } catch (IOException e) {
             Log.e(TAG, e.toString() );
+        } catch (SecurityException e) {
+            Log.e(TAG, e.toString() );
+            mService.errorHasOccurred(mContext.getString(R.string.err_access_mock_location));
         } finally {
             if (mWakeLock.isHeld()) {
                 mWakeLock.release();

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -57,6 +57,8 @@
     <string name="invalid_port">That\'s an invalid port number. Port must be a number between 0 and 65535.</string>
     <string name="err_address_already_in_use">Binding error. Address/port already in use.</string>
     <string name="err_socket_permission_denied">Binding error. Permission denied. (You should use port number >=1024.)</string>
+    <string name="err_access_mock_location">Mock Location Provider could not be created.
+    Is \"Allow mock locations\"  enabled in \"Developer options\"?</string>
 
     <!-- notes -->
     <string name="note_needsreset">Note: This change won\'t take effect until you restart the service.</string>