Update app version

Gracefully handle package downgrade (fix #350)

app/build.gradle

@@ -2,15 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.2'
 
     defaultConfig {
         applicationId "org.traccar.client"
         buildConfigField "boolean", "HIDDEN_APP", "false"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 48
-        versionName '5.11'
+        versionCode 54
+        versionName '5.17'
     }
 
     lintOptions {
@@ -35,12 +34,12 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:design:28.0.0-rc01'
-    implementation 'com.mapzen.android:lost:3.0.4'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.8'
-    googleImplementation 'com.google.firebase:firebase-core:16.0.1'
-    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
+    testImplementation 'org.robolectric:robolectric:4.1'
+    googleImplementation 'com.google.firebase:firebase-core:16.0.6'
+    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
+    googleImplementation "com.google.android.gms:play-services-location:16.0.0"
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {

app/src/google/java/org/traccar/client/GoogleMainApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/google/java/org/traccar/client/GooglePositionProvider.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.location.Location;
+
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.tasks.OnSuccessListener;
+
+public class GooglePositionProvider extends PositionProvider {
+
+    private FusedLocationProviderClient fusedLocationClient;
+
+    public GooglePositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+        fusedLocationClient = LocationServices.getFusedLocationProviderClient(context);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void startUpdates() {
+        LocationRequest locationRequest = new LocationRequest();
+        locationRequest.setPriority(getPriority(preferences.getString(MainFragment.KEY_ACCURACY, "medium")));
+        locationRequest.setInterval(distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval);
+        fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, null);
+    }
+
+    public void stopUpdates() {
+        fusedLocationClient.removeLocationUpdates(locationCallback);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void requestSingleLocation() {
+        fusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() {
+            @Override
+            public void onSuccess(Location location) {
+                if (location != null) {
+                    listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+                }
+            }
+        });
+    }
+
+    private static int getPriority(String accuracy) {
+        switch (accuracy) {
+            case "high":
+                return LocationRequest.PRIORITY_HIGH_ACCURACY;
+            case "low":
+                return LocationRequest.PRIORITY_LOW_POWER;
+            default:
+                return LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
+        }
+    }
+
+    private LocationCallback locationCallback = new LocationCallback() {
+        @Override
+        public void onLocationResult(LocationResult locationResult) {
+            if (locationResult != null) {
+                for (Location location : locationResult.getLocations()) {
+                    processLocation(location);
+                }
+            }
+        }
+    };
+
+}

app/src/google/java/org/traccar/client/PositionProviderFactory.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.Context;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new GooglePositionProvider(context, listener);
+    }
+
+}

app/src/hidden/java/org/traccar/client/PositionProviderFactory.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.Context;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new AndroidPositionProvider(context, listener);
+    }
+
+}

app/src/main/AndroidManifest.xml

@@ -12,6 +12,9 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
+    <uses-feature android:name="android.hardware.location.network" />
+    <uses-feature android:name="android.hardware.location.gps" />
+
     <application
         android:allowBackup="true"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -20,6 +23,10 @@
         android:theme="@style/AppTheme"
         android:name=".MainApplication">
 
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
+
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask" />

app/src/main/java/org/traccar/client/AboutActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ package org.traccar.client;
 
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.TextView;
 

app/src/main/java/org/traccar/client/AndroidPositionProvider.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.os.Looper;
+
+public class AndroidPositionProvider extends PositionProvider implements LocationListener {
+
+    private LocationManager locationManager;
+    private String provider;
+
+    public AndroidPositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        provider = getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium"));
+    }
+
+    @SuppressLint("MissingPermission")
+    public void startUpdates() {
+        try {
+            locationManager.requestLocationUpdates(
+                    provider, distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0, this);
+        } catch (RuntimeException e) {
+            listener.onPositionError(e);
+        }
+    }
+
+    public void stopUpdates() {
+        locationManager.removeUpdates(this);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void requestSingleLocation() {
+        try {
+            Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
+            if (location != null) {
+                listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+            } else {
+                locationManager.requestSingleUpdate(provider, new LocationListener() {
+                    @Override
+                    public void onLocationChanged(Location location) {
+                        listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+                    }
+
+                    @Override
+                    public void onStatusChanged(String provider, int status, Bundle extras) {
+                    }
+
+                    @Override
+                    public void onProviderEnabled(String provider) {
+                    }
+
+                    @Override
+                    public void onProviderDisabled(String provider) {
+                    }
+                }, Looper.myLooper());
+            }
+        } catch (RuntimeException e) {
+            listener.onPositionError(e);
+        }
+    }
+
+    private static String getProvider(String accuracy) {
+        switch (accuracy) {
+            case "high":
+                return LocationManager.GPS_PROVIDER;
+            case "low":
+                return LocationManager.PASSIVE_PROVIDER;
+            default:
+                return LocationManager.NETWORK_PROVIDER;
+        }
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        processLocation(location);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+    }
+
+}

app/src/main/java/org/traccar/client/AutostartReceiver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/DatabaseHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,6 +90,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         onCreate(db);
     }
 
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS position;");
+        onCreate(db);
+    }
+
     public void insertPosition(Position position) {
         ContentValues values = new ContentValues();
         values.put("deviceId", position.getDeviceId());

app/src/main/java/org/traccar/client/DialLaunchReceiver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/DistanceCalculator.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.client;
-
-public final class DistanceCalculator {
-
-    private static final double EQUATORIAL_EARTH_RADIUS = 6378.1370;
-    private static final double DEG_TO_RAD = Math.PI / 180;
-
-    public static double distance(double lat1, double lon1, double lat2, double lon2) {
-        double dlong = (lon2 - lon1) * DEG_TO_RAD;
-        double dlat = (lat2 - lat1) * DEG_TO_RAD;
-        double a = Math.pow(Math.sin(dlat / 2), 2)
-                + Math.cos(lat1 * DEG_TO_RAD) * Math.cos(lat2 * DEG_TO_RAD) * Math.pow(Math.sin(dlong / 2), 2);
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-        double d = EQUATORIAL_EARTH_RADIUS * c;
-        return d * 1000;
-    }
-
-}

app/src/main/java/org/traccar/client/MainActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.traccar.client;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 

app/src/main/java/org/traccar/client/MainApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/MainFragment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.traccar.client;
 
 import android.Manifest;
 import android.app.AlarmManager;
-import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
@@ -28,14 +27,14 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.TwoStatePreference;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -43,9 +42,7 @@ import android.view.MenuItem;
 import android.webkit.URLUtil;
 import android.widget.Toast;
 
-import java.util.HashSet;
 import java.util.Random;
-import java.util.Set;
 
 public class MainFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener {
 
@@ -215,19 +212,11 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
 
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
-            Set<String> missingPermissions = new HashSet<>();
-            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
-            }
-            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
-            }
-            if (missingPermissions.isEmpty()) {
+            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
                 permission = true;
             } else {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]),
-                            PERMISSIONS_REQUEST_LOCATION);
+                    requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_REQUEST_LOCATION);
                 }
                 return;
             }

app/src/main/java/org/traccar/client/NetworkManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/Position.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/PositionProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.traccar.client;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -25,35 +24,28 @@ import android.os.BatteryManager;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.mapzen.android.lost.api.LocationListener;
-import com.mapzen.android.lost.api.LocationRequest;
-import com.mapzen.android.lost.api.LocationServices;
-import com.mapzen.android.lost.api.LostApiClient;
-
-public class PositionProvider implements LostApiClient.ConnectionCallbacks, LocationListener {
+public abstract class PositionProvider {
 
     private static final String TAG = PositionProvider.class.getSimpleName();
 
-    private static final int MINIMUM_INTERVAL = 1000;
+    protected static final int MINIMUM_INTERVAL = 1000;
 
     public interface PositionListener {
         void onPositionUpdate(Position position);
+        void onPositionError(Throwable error);
     }
 
-    private final PositionListener listener;
+    protected final PositionListener listener;
 
-    private final Context context;
-    private SharedPreferences preferences;
-    private LostApiClient apiClient;
+    protected final Context context;
+    protected SharedPreferences preferences;
 
-    private String deviceId;
-    private long interval;
-    private double distance;
-    private double angle;
+    protected String deviceId;
+    protected long interval;
+    protected double distance;
+    protected double angle;
 
-    private Location lastLocation;
-
-    private boolean started;
+    protected Location lastLocation;
 
     public PositionProvider(Context context, PositionListener listener) {
         this.context = context;
@@ -67,41 +59,16 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
         angle = Integer.parseInt(preferences.getString(MainFragment.KEY_ANGLE, "0"));
     }
 
-    public void startUpdates() {
-        started = true;
-        apiClient = new LostApiClient.Builder(context).addConnectionCallbacks(this).build();
-        apiClient.connect();
-    }
+    public abstract void startUpdates();
 
-    private int getPriority(String accuracy) {
-        switch (accuracy) {
-            case "high":
-                return LocationRequest.PRIORITY_HIGH_ACCURACY;
-            case "low":
-                return LocationRequest.PRIORITY_LOW_POWER;
-            default:
-                return LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
-        }
-    }
+    public abstract void stopUpdates();
 
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onConnected() {
-        if (started) {
-            LocationRequest request = LocationRequest.create()
-                    .setPriority(getPriority(preferences.getString(MainFragment.KEY_ACCURACY, "medium")))
-                    .setInterval(distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval);
-            LocationServices.FusedLocationApi.requestLocationUpdates(apiClient, request, this);
-        } else {
-            apiClient.disconnect();
-        }
-    }
+    public abstract void requestSingleLocation();
 
-    @Override
-    public void onLocationChanged(Location location) {
+    protected void processLocation(Location location) {
         if (location != null && (lastLocation == null
                 || location.getTime() - lastLocation.getTime() >= interval
-                || distance > 0 && DistanceCalculator.distance(location.getLatitude(), location.getLongitude(), lastLocation.getLatitude(), lastLocation.getLongitude()) >= distance
+                || distance > 0 && location.distanceTo(lastLocation) >= distance
                 || angle > 0 && Math.abs(location.getBearing() - lastLocation.getBearing()) >= angle)) {
             Log.i(TAG, "location new");
             lastLocation = location;
@@ -111,20 +78,7 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
         }
     }
 
-    @Override
-    public void onConnectionSuspended() {
-        Log.i(TAG, "lost client suspended");
-    }
-
-    public void stopUpdates() {
-        if (apiClient.isConnected()) {
-            LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, this);
-            apiClient.disconnect();
-        }
-        started = false;
-    }
-
-    public static double getBatteryLevel(Context context) {
+    protected static double getBatteryLevel(Context context) {
         Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         if (batteryIntent != null) {
             int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);

app/src/main/java/org/traccar/client/ProtocolFormatter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/RequestManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

app/src/main/java/org/traccar/client/ShortcutActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,25 +17,23 @@ package org.traccar.client;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.location.Location;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.mapzen.android.lost.api.LocationServices;
-import com.mapzen.android.lost.api.LostApiClient;
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
 
-public class ShortcutActivity extends AppCompatActivity implements LostApiClient.ConnectionCallbacks {
+public class ShortcutActivity extends AppCompatActivity {
 
     public static final String EXTRA_ACTION = "action";
     public static final String ACTION_START = "start";
@@ -44,8 +42,6 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
 
     private static final String ALARM_SOS = "sos";
 
-    private LostApiClient apiClient;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,24 +98,12 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
         setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(this, shortcut));
     }
 
-    private void sendAlarm() {
-        apiClient = new LostApiClient.Builder(this).addConnectionCallbacks(this).build();
-        apiClient.connect();
-    }
-
     @SuppressWarnings("MissingPermission")
+    private void sendAlarm() {
+        PositionProviderFactory.create(this, new PositionProvider.PositionListener() {
             @Override
-    public void onConnected() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-
-        Location location = LocationServices.FusedLocationApi.getLastLocation(apiClient);
-
-        if (location != null) {
-
-            Position position = new Position(
-                    preferences.getString(MainFragment.KEY_DEVICE, null),
-                    location, PositionProvider.getBatteryLevel(this));
-
+            public void onPositionUpdate(Position position) {
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ShortcutActivity.this);
                 String request = ProtocolFormatter.formatRequest(
                         preferences.getString(MainFragment.KEY_URL, null), position, ALARM_SOS);
 
@@ -133,16 +117,13 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
                         }
                     }
                 });
-
-        } else {
-            Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
-        }
-
-        apiClient.disconnect();
             }
 
             @Override
-    public void onConnectionSuspended() {
+            public void onPositionError(Throwable error) {
+                Toast.makeText(ShortcutActivity.this, error.getMessage(), Toast.LENGTH_LONG).show();
+            }
+        }).requestSingleLocation();
     }
 
     private boolean executeAction(Intent intent) {
@@ -168,7 +149,11 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
                     Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
                     break;
                 case ACTION_SOS:
+                    if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
                         sendAlarm();
+                    } else {
+                        Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
+                    }
                     break;
             }
             finish();

app/src/main/java/org/traccar/client/StatusActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import java.util.LinkedList;
 import java.util.Set;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -43,7 +43,7 @@ public class StatusActivity extends AppCompatActivity {
     }
 
     public static void addMessage(String message) {
-        DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT);
+        DateFormat format = DateFormat.getTimeInstance(DateFormat.MEDIUM);
         message = format.format(new Date()) + " - " + message;
         messages.add(message);
         while (messages.size() > LIMIT) {

app/src/main/java/org/traccar/client/TrackingController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         this.context = context;
         handler = new Handler();
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        positionProvider = new PositionProvider(context, this);
+        positionProvider = PositionProviderFactory.create(context, this);
         databaseHelper = new DatabaseHelper(context);
         networkManager = new NetworkManager(context, this);
         isOnline = networkManager.isOnline();
@@ -98,6 +98,10 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         }
     }
 
+    @Override
+    public void onPositionError(Throwable error) {
+    }
+
     @Override
     public void onNetworkUpdate(boolean isOnline) {
         int message = isOnline ? R.string.status_network_online : R.string.status_network_offline;

app/src/main/java/org/traccar/client/TrackingService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 public class TrackingService extends Service {
@@ -78,15 +78,17 @@ public class TrackingService extends Service {
         Log.i(TAG, "service create");
         StatusActivity.addMessage(getString(R.string.status_service_create));
 
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                && ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+        startForeground(NOTIFICATION_ID, createNotification(this));
+
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
             trackingController = new TrackingController(this);
             trackingController.start();
         }
 
-        startForeground(NOTIFICATION_ID, createNotification(this));
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             ContextCompat.startForegroundService(this, new Intent(this, HideNotificationService.class));
         }
+    }
 
     @Override
     public IBinder onBind(Intent intent) {

app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.java

@@ -18,7 +18,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.SparseArray;
 
 public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {

app/src/regular/java/org/traccar/client/PositionProviderFactory.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.Context;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new AndroidPositionProvider(context, listener);
+    }
+
+}

app/src/test/java/org/traccar/client/DatabaseHelperTest.java

@@ -15,7 +15,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class DatabaseHelperTest {
 
     @Test

app/src/test/java/org/traccar/client/ProtocolFormatterTest.java

@@ -13,7 +13,6 @@ import java.util.Date;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class ProtocolFormatterTest {
 
     @Test

app/src/test/java/org/traccar/client/RequestManagerTest.java

@@ -10,7 +10,6 @@ import org.robolectric.annotation.Config;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class RequestManagerTest {
 
     @Ignore

build.gradle

@@ -5,9 +5,9 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.gms:google-services:4.0.2'
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'io.fabric.tools:gradle:1.26.1'
     }
 }
 

gradle.properties

@@ -0,0 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
+android.enableUnitTestBinaryResources=true

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip