Update app version

app/build.gradle

@@ -9,8 +9,8 @@ android {
         buildConfigField "boolean", "HIDDEN_APP", "false"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 50
+        versionCode 53
-        versionName '5.13'
+        versionName '5.16'
     }
 
     lintOptions {
@@ -35,10 +35,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:design:28.0.0-rc02'
+    implementation 'com.android.support:design:28.0.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:3.8'
-    googleImplementation 'com.google.firebase:firebase-core:16.0.3'
+    googleImplementation 'com.google.firebase:firebase-core:16.0.5'
     googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
 }
 

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

@@ -215,19 +215,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) {
-            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()) {
                 permission = true;
             } else {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]),
+                    requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_REQUEST_LOCATION);
-                            PERMISSIONS_REQUEST_LOCATION);
                 }
                 return;
             }

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

@@ -20,13 +20,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.BatteryManager;
 import android.os.Bundle;
-import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
@@ -72,31 +70,22 @@ public class PositionProvider implements LocationListener {
     public void startUpdates() {
         try {
             locationManager.requestLocationUpdates(
-                    distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0,
+                    getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium")),
-                    getCriteria(preferences.getString(MainFragment.KEY_ACCURACY, "medium")),
+                    distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0, this);
-                    this, Looper.myLooper());
         } catch (RuntimeException e) {
             Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
         }
     }
 
-    public static Criteria getCriteria(String accuracy) {
+    public static String getProvider(String accuracy) {
-        Criteria criteria = new Criteria();
         switch (accuracy) {
             case "high":
-                criteria.setHorizontalAccuracy(Criteria.ACCURACY_HIGH);
+                return LocationManager.GPS_PROVIDER;
-                criteria.setPowerRequirement(Criteria.POWER_HIGH);
-                break;
             case "low":
-                criteria.setHorizontalAccuracy(Criteria.ACCURACY_LOW);
+                return LocationManager.PASSIVE_PROVIDER;
-                criteria.setPowerRequirement(Criteria.POWER_LOW);
-                break;
             default:
-                criteria.setHorizontalAccuracy(Criteria.ACCURACY_MEDIUM);
+                return LocationManager.NETWORK_PROVIDER;
-                criteria.setPowerRequirement(Criteria.POWER_MEDIUM);
-                break;
         }
-        return criteria;
     }
 
     @Override

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

@@ -108,15 +108,15 @@ public class ShortcutActivity extends AppCompatActivity {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 
-        Criteria criteria = PositionProvider.getCriteria(
+        String provider = PositionProvider.getProvider(
                 preferences.getString(MainFragment.KEY_ACCURACY, "medium"));
 
         try {
-            Location location = locationManager.getLastKnownLocation(locationManager.getBestProvider(criteria, true));
+            Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
             if (location != null) {
                 sendAlarmLocation(location);
             } else {
-                locationManager.requestSingleUpdate(criteria, new LocationListener() {
+                locationManager.requestSingleUpdate(provider, new LocationListener() {
                     @Override
                     public void onLocationChanged(Location location) {
                         sendAlarmLocation(location);
@@ -185,8 +185,7 @@ public class ShortcutActivity extends AppCompatActivity {
                     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
+                    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();

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

@@ -80,8 +80,7 @@ public class TrackingService extends Service {
 
         startForeground(NOTIFICATION_ID, createNotification(this));
 
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+        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();
         }