Update app version

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "org.traccar.client"
         buildConfigField "boolean", "HIDDEN_APP", "false"
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 55
-        versionName '5.18'
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 60
+        versionName '5.23'
     }
 
     lintOptions {
@@ -34,12 +34,13 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'androidx.preference:preference:1.1.0'
     testImplementation 'junit:junit:4.12'
     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"
+    googleImplementation 'com.google.firebase:firebase-core:17.2.0'
+    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    googleImplementation "com.google.android.gms:play-services-location:17.0.0"
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {

app/src/google/AndroidManifest.xml

@@ -5,7 +5,8 @@
 
     <application
         android:name="org.traccar.client.GoogleMainApplication"
-        tools:replace="android:name">
+        tools:replace="android:name"
+        tools:ignore="GoogleAppIndexingWarning">
 
     </application>
 

app/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.traccar.client">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -21,7 +23,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:name=".MainApplication">
+        android:name=".MainApplication"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data
             android:name="google_analytics_adid_collection_enabled"
@@ -45,8 +48,6 @@
 
         <activity android:name=".StatusActivity"/>
 
-        <activity android:name=".AboutActivity"/>
-
         <activity
             android:name=".ShortcutActivity"
             android:label="@string/menu_shortcuts">
@@ -56,9 +57,12 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".TrackingService" />
+        <service
+            android:name=".TrackingService"
+            android:foregroundServiceType="location" />
 
-        <service android:name=".TrackingService$HideNotificationService" />
+        <service
+            android:name=".TrackingService$HideNotificationService" />
 
         <receiver android:name=".AutostartReceiver">
             <intent-filter>

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

@@ -1,39 +0,0 @@
-/*
- * 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.
- * 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.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import android.util.Log;
-import android.widget.TextView;
-
-public class AboutActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.about);
-
-        TextView title = findViewById(R.id.title);
-        try {
-            title.setText(title.getText() + " " + getPackageManager().getPackageInfo(this.getPackageName(), 0).versionName);
-        } catch (NameNotFoundException e) {
-            Log.w(AboutActivity.class.getSimpleName(), e);
-        }
-    }
-
-}

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

@@ -25,7 +25,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState == null) {
-            getFragmentManager().beginTransaction().replace(android.R.id.content, new MainFragment()).commit();
+            getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new MainFragment()).commit();
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 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.
@@ -27,14 +27,15 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.TwoStatePreference;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.TwoStatePreference;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -42,9 +43,11 @@ 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 {
+public class MainFragment extends PreferenceFragmentCompat implements OnSharedPreferenceChangeListener {
 
     private static final String TAG = MainFragment.class.getSimpleName();
 
@@ -66,15 +69,14 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
     private PendingIntent alarmIntent;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (BuildConfig.HIDDEN_APP) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        if (BuildConfig.HIDDEN_APP && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             removeLauncherIcon();
         }
 
         setHasOptionsMenu(true);
 
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
 
@@ -129,6 +131,7 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
             startTrackingService(true, false);
         }
+
     }
 
     private void removeLauncherIcon() {
@@ -192,9 +195,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         if (item.getItemId() == R.id.status) {
             startActivity(new Intent(getActivity(), StatusActivity.class));
             return true;
-        } else if (item.getItemId() == R.id.about) {
-            startActivity(new Intent(getActivity(), AboutActivity.class));
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -212,11 +212,18 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
 
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
-            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                permission = true;
-            } else {
+            Set<String> requiredPermissions = new HashSet<>();
+            if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requiredPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+                    && ContextCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_BACKGROUND_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requiredPermissions.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION);
+            }
+            permission = requiredPermissions.isEmpty();
+            if (!permission) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_REQUEST_LOCATION);
+                    requestPermissions(requiredPermissions.toArray(new String[requiredPermissions.size()]), PERMISSIONS_REQUEST_LOCATION);
                 }
                 return;
             }
@@ -224,12 +231,12 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
 
         if (permission) {
             setPreferencesEnabled(false);
-            ContextCompat.startForegroundService(getActivity(), new Intent(getActivity(), TrackingService.class));
+            ContextCompat.startForegroundService(getContext(), new Intent(getActivity(), TrackingService.class));
             alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                     ALARM_MANAGER_INTERVAL, ALARM_MANAGER_INTERVAL, alarmIntent);
         } else {
             sharedPreferences.edit().putBoolean(KEY_STATUS, false).apply();
-            TwoStatePreference preference = (TwoStatePreference) findPreference(KEY_STATUS);
+            TwoStatePreference preference = findPreference(KEY_STATUS);
             preference.setChecked(false);
         }
     }

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

@@ -18,7 +18,6 @@ package org.traccar.client;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Handler;
-import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -41,18 +40,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private DatabaseHelper databaseHelper;
     private NetworkManager networkManager;
 
-    private PowerManager.WakeLock wakeLock;
-
-    private void lock() {
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
-    }
-
-    private void unlock() {
-        if (wakeLock.isHeld()) {
-            wakeLock.release();
-        }
-    }
-
     public TrackingController(Context context) {
         this.context = context;
         handler = new Handler();
@@ -63,9 +50,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         isOnline = networkManager.isOnline();
 
         url = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value));
-
-        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
     }
 
     public void start() {
@@ -133,7 +117,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private void write(Position position) {
         log("write", position);
-        lock();
         databaseHelper.insertPositionAsync(position, new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
             public void onComplete(boolean success, Void result) {
@@ -143,14 +126,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                         isWaiting = false;
                     }
                 }
-                unlock();
             }
         });
     }
 
     private void read() {
         log("read", null);
-        lock();
         databaseHelper.selectPositionAsync(new DatabaseHelper.DatabaseHandler<Position>() {
             @Override
             public void onComplete(boolean success, Position result) {
@@ -167,14 +148,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                 } else {
                     retry();
                 }
-                unlock();
             }
         });
     }
 
     private void delete(Position position) {
         log("delete", position);
-        lock();
         databaseHelper.deletePositionAsync(position.getId(), new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
             public void onComplete(boolean success, Void result) {
@@ -183,14 +162,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                 } else {
                     retry();
                 }
-                unlock();
             }
         });
     }
 
     private void send(final Position position) {
         log("send", position);
-        lock();
         String request = ProtocolFormatter.formatRequest(url, position);
         RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
             @Override
@@ -201,7 +178,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                     StatusActivity.addMessage(context.getString(R.string.status_send_fail));
                     retry();
                 }
-                unlock();
             }
         });
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 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,6 +15,7 @@
  */
 package org.traccar.client;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -26,6 +27,8 @@ import android.os.Build;
 import android.os.IBinder;
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
+
+import android.os.PowerManager;
 import android.util.Log;
 
 public class TrackingService extends Service {
@@ -33,13 +36,14 @@ public class TrackingService extends Service {
     private static final String TAG = TrackingService.class.getSimpleName();
     private static final int NOTIFICATION_ID = 1;
 
+    private PowerManager.WakeLock wakeLock;
     private TrackingController trackingController;
 
     private static Notification createNotification(Context context) {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL)
                 .setSmallIcon(R.drawable.ic_stat_notify)
                 .setPriority(NotificationCompat.PRIORITY_LOW)
-                .setCategory(Notification.CATEGORY_SERVICE);
+                .setCategory(NotificationCompat.CATEGORY_SERVICE);
         Intent intent;
         if (!BuildConfig.HIDDEN_APP) {
             intent = new Intent(context, MainActivity.class);
@@ -73,6 +77,7 @@ public class TrackingService extends Service {
         }
     }
 
+    @SuppressLint("WakelockTimeout")
     @Override
     public void onCreate() {
         Log.i(TAG, "service create");
@@ -81,6 +86,11 @@ public class TrackingService extends Service {
         startForeground(NOTIFICATION_ID, createNotification(this));
 
         if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+
+            PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
+            wakeLock.acquire();
+
             trackingController = new TrackingController(this);
             trackingController.start();
         }
@@ -111,6 +121,9 @@ public class TrackingService extends Service {
 
         stopForeground(true);
 
+        if (wakeLock != null && wakeLock.isHeld()) {
+            wakeLock.release();
+        }
         if (trackingController != null) {
             trackingController.stop();
         }

app/src/main/res/layout/about.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_toRightOf="@+id/logo"
-    android:layout_toEndOf="@+id/logo"
-    android:padding="@dimen/spacing_normal"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/spacing_normal"
-        android:text="@string/app_name"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/spacing_normal"
-        android:text="@string/about_description" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/spacing_normal"
-        android:text="@string/about_license" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/about_web"
-        android:autoLink="web" />
-
-</LinearLayout>

app/src/main/res/menu/main.xml

@@ -8,9 +8,4 @@
         android:title="@string/menu_status"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/about"
-        android:title="@string/menu_about"
-        app:showAsAction="never" />
-
 </menu>

app/src/main/res/values/strings.xml

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Foreground service</string>
   <string name="settings_foreground_summary">Increase service priority</string>
   <string name="menu_status">Status</string>
-  <string name="menu_about">About</string>
   <string name="menu_shortcuts">Add shortcuts</string>
   <string name="menu_clear">Clear</string>
-  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
-  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
-  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
   <string name="status_service_create">Service started</string>
   <string name="status_service_destroy">Service stopped</string>
   <string name="status_send_success">Send successfully</string>

build.gradle

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

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