Fix errors and set min sdk version up to 23

Author: firemaples

app/build.gradle

@@ -11,7 +11,7 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.firemaples.androidlocationremotecontrol"
-        minSdkVersion 14
+        minSdkVersion 23
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
@@ -33,9 +33,10 @@ dependencies {
     compile 'com.github.hotchemi:permissionsdispatcher:2.1.3'
     apt 'com.github.hotchemi:permissionsdispatcher-processor:2.1.3'
     compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.android.gms:play-services:9.4.0'
+    compile 'com.google.android.gms:play-services-location:9.4.0'
+    compile 'com.google.android.gms:play-services-maps:9.4.0'
     compile 'org.apache.commons:commons-lang3:3.4'
-    compile files('libs/Java-WebSocket-Library-1.2.1-SNAPSHOT.jar')
-
+//    compile files('libs/Java-WebSocket-Library-1.2.1-SNAPSHOT.jar')
+    compile 'org.java-websocket:Java-WebSocket:1.3.0'
 }
 

app/src/main/java/com/firemaples/androidlocationremotecontrol/MainActivity.java

@@ -179,6 +179,21 @@ public void run() {
             });
         }
 
+        @Override
+        public void onMockModeStartingFailed(String message) {
+            AlertDialog.Builder ab = new AlertDialog.Builder(MainActivity.this);
+            ab.setTitle("Error");
+            ab.setMessage(message);
+            ab.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    finish();
+                }
+            });
+            ab.setCancelable(false);
+            ab.show();
+        }
+
         private void showWaitingString(RemoteListenerService service) {
             new ShowConnectionInfoThread(service).start();
         }

app/src/main/java/com/firemaples/androidlocationremotecontrol/RemoteListenerService.java

@@ -14,7 +14,6 @@
 import android.os.SystemClock;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NotificationCompat;
-import android.widget.Toast;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -87,7 +86,7 @@ public void stopListening() {
         if (socketServer != null) {
             try {
                 socketServer.stop(1);
-            } catch (InterruptedException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
@@ -141,18 +140,18 @@ private void mockLocation(double lat, double lng) {
 
     private void disableMockProvider() {
         if (locationManager != null) {
-            locationManager.setTestProviderEnabled(locationProvider, false);
             if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 return;
             }
             try {
+                locationManager.setTestProviderEnabled(locationProvider, false);
                 LocationServices.FusedLocationApi.setMockMode(googleApiClient, false);
+                locationManager.clearTestProviderEnabled(locationProvider);
+                locationManager.clearTestProviderStatus(locationProvider);
+                locationManager.clearTestProviderLocation(locationProvider);
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            locationManager.clearTestProviderEnabled(locationProvider);
-            locationManager.clearTestProviderStatus(locationProvider);
-            locationManager.clearTestProviderLocation(locationProvider);
         }
 
         removeNotification();
@@ -281,10 +280,9 @@ protected void startMockMode() {
         try {
             //noinspection MissingPermission
             LocationServices.FusedLocationApi.setMockMode(googleApiClient, true);
-        } catch (Exception e) {
+        } catch (SecurityException e) {
             e.printStackTrace();
-            Toast.makeText(this, "Please set this app in mock location app", Toast.LENGTH_LONG).show();
-            stopSelf();
+            callback.onMockModeStartingFailed(e.getMessage());
         }
     }
 
@@ -312,5 +310,7 @@ public interface OnRemoteListenerCallback {
         void onDisconnected(RemoteListenerService service);
 
         void onMockLocationChange(RemoteListenerService service, double lat, double lng);
+
+        void onMockModeStartingFailed(String message);
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Wed Sep 21 14:22:21 CST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip