Update version number

Gracefully handle package downgrade (fix #350)

app/build.gradle

@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         applicationId "org.traccar.client"
         buildConfigField "boolean", "HIDDEN_APP", "false"
         minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 46
-        versionName '5.9'
+        targetSdkVersion 28
+        versionCode 52
+        versionName '5.15'
     }
 
     lintOptions {
@@ -26,15 +26,20 @@ android {
             buildConfigField "boolean", "HIDDEN_APP", "true"
         }
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
-    compile 'com.android.support:design:27.1.0'
-    compile 'com.mapzen.android:lost:3.0.4'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.6.1'
-    googleCompile 'com.google.firebase:firebase-core:11.8.0'
-    googleCompile 'com.crashlytics.sdk.android:crashlytics:2.9.1'
+    implementation 'com.android.support:design:28.0.0-rc02'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.8'
+    googleImplementation 'com.google.firebase:firebase-core:16.0.3'
+    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {

app/src/main/AndroidManifest.xml

@@ -9,15 +9,21 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
         android:allowBackup="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         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/DatabaseHelper.java

@@ -27,7 +27,7 @@ import java.util.Date;
 
 public class DatabaseHelper extends SQLiteOpenHelper {
 
-    public static final int DATABASE_VERSION = 2;
+    public static final int DATABASE_VERSION = 3;
     public static final String DATABASE_NAME = "traccar.db";
 
     public interface DatabaseHandler<T> {
@@ -80,7 +80,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                 "speed REAL," +
                 "course REAL," +
                 "accuracy REAL," +
-                "battery REAL)");
+                "battery REAL," +
+                "mock INTEGER)");
     }
 
     @Override
@@ -89,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());
@@ -100,6 +106,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         values.put("course", position.getCourse());
         values.put("accuracy", position.getAccuracy());
         values.put("battery", position.getBattery());
+        values.put("mock", position.getMock() ? 1 : 0);
 
         db.insertOrThrow("position", null, values);
     }
@@ -133,6 +140,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                 position.setCourse(cursor.getDouble(cursor.getColumnIndex("course")));
                 position.setAccuracy(cursor.getDouble(cursor.getColumnIndex("accuracy")));
                 position.setBattery(cursor.getDouble(cursor.getColumnIndex("battery")));
+                position.setMock(cursor.getInt(cursor.getColumnIndex("mock")) > 0);
 
             } else {
                 return null;

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/MainFragment.java

@@ -150,13 +150,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         }
     }
 
-    private boolean hasPermission(String permission) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return true;
-        }
-        return ContextCompat.checkSelfPermission(getActivity(), permission) == PackageManager.PERMISSION_GRANTED;
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -223,10 +216,10 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
             Set<String> missingPermissions = new HashSet<>();
-            if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
+            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
             }
-            if (!hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
             }
             if (missingPermissions.isEmpty()) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2018 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.traccar.client;
 
 import android.location.Location;
 import android.location.LocationManager;
+import android.os.Build;
 
 import java.util.Date;
 
@@ -37,6 +38,9 @@ public class Position {
             accuracy = location.getAccuracy();
         }
         this.battery = battery;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            this.mock = location.isFromMockProvider();
+        }
     }
 
     private long id;
@@ -139,4 +143,14 @@ public class Position {
         this.battery = battery;
     }
 
+    private boolean mock;
+
+    public boolean getMock() {
+        return mock;
+    }
+
+    public void setMock(boolean mock) {
+        this.mock = mock;
+    }
+
 }

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

@@ -21,16 +21,15 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.BatteryManager;
+import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.widget.Toast;
 
-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 class PositionProvider implements LocationListener {
 
     private static final String TAG = PositionProvider.class.getSimpleName();
 
@@ -44,7 +43,7 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
 
     private final Context context;
     private SharedPreferences preferences;
-    private LostApiClient apiClient;
+    private LocationManager locationManager;
 
     private String deviceId;
     private long interval;
@@ -53,12 +52,12 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
 
     private Location lastLocation;
 
-    private boolean started;
-
     public PositionProvider(Context context, PositionListener listener) {
         this.context = context;
         this.listener = listener;
 
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         deviceId = preferences.getString(MainFragment.KEY_DEVICE, "undefined");
@@ -67,33 +66,25 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
         angle = Integer.parseInt(preferences.getString(MainFragment.KEY_ANGLE, "0"));
     }
 
+    @SuppressLint("MissingPermission")
     public void startUpdates() {
-        started = true;
-        apiClient = new LostApiClient.Builder(context).addConnectionCallbacks(this).build();
-        apiClient.connect();
+        try {
+            locationManager.requestLocationUpdates(
+                    getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium")),
+                    distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0, this);
+        } catch (RuntimeException e) {
+            Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+        }
     }
 
-    private int getPriority(String accuracy) {
+    public static String getProvider(String accuracy) {
         switch (accuracy) {
             case "high":
-                return LocationRequest.PRIORITY_HIGH_ACCURACY;
+                return LocationManager.GPS_PROVIDER;
             case "low":
-                return LocationRequest.PRIORITY_LOW_POWER;
+                return LocationManager.PASSIVE_PROVIDER;
             default:
-                return LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
-        }
-    }
-
-    @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();
+                return LocationManager.NETWORK_PROVIDER;
         }
     }
 
@@ -101,7 +92,7 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
     public void onLocationChanged(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;
@@ -112,16 +103,19 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
     }
 
     @Override
-    public void onConnectionSuspended() {
-        Log.i(TAG, "lost client suspended");
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
     }
 
     public void stopUpdates() {
-        if (apiClient.isConnected()) {
-            LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, this);
-            apiClient.disconnect();
-        }
-        started = false;
+        locationManager.removeUpdates(this);
     }
 
     public static double getBatteryLevel(Context context) {

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

@@ -36,6 +36,10 @@ public class ProtocolFormatter {
                 .appendQueryParameter("accuracy", String.valueOf(position.getAccuracy()))
                 .appendQueryParameter("batt", String.valueOf(position.getBattery()));
 
+        if (position.getMock()) {
+            builder.appendQueryParameter("mock", String.valueOf(position.getMock()));
+        }
+
         if (alarm != null) {
             builder.appendQueryParameter("alarm", alarm);
         }

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

@@ -15,10 +15,16 @@
  */
 package org.traccar.client;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.location.Criteria;
 import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.Bundle;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.v4.content.ContextCompat;
@@ -32,10 +38,7 @@ 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;
-
-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 +47,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,20 +103,46 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
         setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(this, shortcut));
     }
 
+    @SuppressWarnings("MissingPermission")
     private void sendAlarm() {
-        apiClient = new LostApiClient.Builder(this).addConnectionCallbacks(this).build();
-        apiClient.connect();
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+
+        String provider = PositionProvider.getProvider(
+                preferences.getString(MainFragment.KEY_ACCURACY, "medium"));
+
+        try {
+            Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
+            if (location != null) {
+                sendAlarmLocation(location);
+            } else {
+                locationManager.requestSingleUpdate(provider, new LocationListener() {
+                    @Override
+                    public void onLocationChanged(Location location) {
+                        sendAlarmLocation(location);
                     }
 
-    @SuppressWarnings("MissingPermission")
                     @Override
-    public void onConnected() {
+                    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) {
+            Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void sendAlarmLocation(Location location) {
         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));
@@ -133,16 +160,6 @@ 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() {
     }
 
     private boolean executeAction(Intent intent) {
@@ -168,7 +185,12 @@ 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
+                            && ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_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

@@ -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/TrackingService.java

@@ -21,6 +21,7 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
@@ -77,12 +78,18 @@ public class TrackingService extends Service {
         Log.i(TAG, "service create");
         StatusActivity.addMessage(getString(R.string.status_service_create));
 
+        startForeground(NOTIFICATION_ID, createNotification(this));
+
+        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) {
             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/res/xml/network_security_config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>

build.gradle

@@ -5,9 +5,9 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.google.gms:google-services:3.1.1'
-        classpath 'io.fabric.tools:gradle:1.25.1'
+        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'
     }
 }
 
@@ -15,6 +15,5 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
     }
 }

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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip