Update version number

app/build.gradle

@@ -9,8 +9,8 @@ android {
         buildConfigField 'boolean', 'HIDDEN_APP', 'false'
         minSdkVersion 16
         targetSdkVersion 31
-        versionCode 74
-        versionName '6.13'
+        versionCode 77
+        versionName '6.16'
         multiDexEnabled true
     }
 
@@ -47,11 +47,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.5.0-alpha04'
+    implementation 'com.google.android.material:material:1.5.0-alpha05'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.test:core-ktx:1.4.0'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.github.judemanutd:autostarter:1.1.0'
     implementation('dev.doubledot.doki:library:0.0.1@aar') {

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
 
     <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" />

app/src/main/java/org/traccar/client/BatteryOptimizationHelper.kt

@@ -66,7 +66,7 @@ class BatteryOptimizationHelper {
         }
     }
 
-    fun requestException(context: Context) {
+    fun requestException(context: Context): Boolean {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
             if (!sharedPreferences.getBoolean(KEY_EXCEPTION_REQUESTED, false)) {
@@ -80,13 +80,20 @@ class BatteryOptimizationHelper {
                             requestVendorException(context)
                         }
                     }
+                    return true
                 }
             } else if (!sharedPreferences.getBoolean(KEY_AUTOSTART_REQUESTED, false)) {
                 sharedPreferences.edit().putBoolean(KEY_AUTOSTART_REQUESTED, true).apply()
-                AutoStartPermissionHelper.getInstance().getAutoStartPermission(context)
+                try {
+                    if (AutoStartPermissionHelper.getInstance().getAutoStartPermission(context)) {
+                        return true
+                    }
+                } catch (e: SecurityException) {
                 }
             }
         }
+        return false
+    }
 
     companion object {
         private const val KEY_EXCEPTION_REQUESTED = "exceptionRequested"

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

@@ -54,6 +54,7 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
     private lateinit var sharedPreferences: SharedPreferences
     private lateinit var alarmManager: AlarmManager
     private lateinit var alarmIntent: PendingIntent
+    private var requestingPermissions: Boolean = false
 
     @SuppressLint("UnspecifiedImmutableFlag")
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -95,9 +96,9 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
         originalIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
 
         val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PendingIntent.FLAG_MUTABLE
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
         } else {
-            0
+            PendingIntent.FLAG_UPDATE_CURRENT
         }
         alarmIntent = PendingIntent.getBroadcast(activity, 0, originalIntent, flags)
 
@@ -154,6 +155,13 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        if (requestingPermissions) {
+            requestingPermissions = BatteryOptimizationHelper().requestException(requireContext())
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         sharedPreferences.registerOnSharedPreferenceChangeListener(this)
@@ -214,6 +222,19 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
         findPreference<Preference>(KEY_DEVICE)?.summary = sharedPreferences.getString(KEY_DEVICE, null)
     }
 
+    private fun showBackgroundLocationDialog(context: Context, onSuccess: () -> Unit) {
+        val builder = AlertDialog.Builder(context)
+        val option = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            context.packageManager.backgroundPermissionOptionLabel
+        } else {
+            context.getString(R.string.request_background_option)
+        }
+        builder.setMessage(context.getString(R.string.request_background, option))
+        builder.setPositiveButton(android.R.string.ok) { _, _ -> onSuccess() }
+        builder.setNegativeButton(android.R.string.cancel, null)
+        builder.show()
+    }
+
     private fun startTrackingService(checkPermission: Boolean, initialPermission: Boolean) {
         var permission = initialPermission
         if (checkPermission) {
@@ -224,10 +245,7 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
             permission = requiredPermissions.isEmpty()
             if (!permission) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    requestPermissions(
-                        requiredPermissions.toTypedArray(),
-                        PERMISSIONS_REQUEST_LOCATION
-                    )
+                    requestPermissions(requiredPermissions.toTypedArray(), PERMISSIONS_REQUEST_LOCATION)
                 }
                 return
             }
@@ -235,11 +253,22 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
         if (permission) {
             setPreferencesEnabled(false)
             ContextCompat.startForegroundService(requireContext(), Intent(activity, TrackingService::class.java))
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
                 alarmManager.setInexactRepeating(
                     AlarmManager.ELAPSED_REALTIME_WAKEUP,
                     ALARM_MANAGER_INTERVAL.toLong(), ALARM_MANAGER_INTERVAL.toLong(), alarmIntent
                 )
-            BatteryOptimizationHelper().requestException(requireContext())
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+                && ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_BACKGROUND_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requestingPermissions = true
+                showBackgroundLocationDialog(requireContext()) {
+                    requestPermissions(arrayOf(Manifest.permission.ACCESS_BACKGROUND_LOCATION), PERMISSIONS_REQUEST_BACKGROUND_LOCATION)
+                }
+            } else {
+                requestingPermissions = BatteryOptimizationHelper().requestException(requireContext())
+            }
         } else {
             sharedPreferences.edit().putBoolean(KEY_STATUS, false).apply()
             val preference = findPreference<TwoStatePreference>(KEY_STATUS)
@@ -248,7 +277,9 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
     }
 
     private fun stopTrackingService() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
             alarmManager.cancel(alarmIntent)
+        }
         requireActivity().stopService(Intent(activity, TrackingService::class.java))
         setPreferencesEnabled(true)
     }
@@ -292,6 +323,7 @@ class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListene
         const val KEY_BUFFER = "buffer"
         const val KEY_WAKELOCK = "wakelock"
         private const val PERMISSIONS_REQUEST_LOCATION = 2
+        private const val PERMISSIONS_REQUEST_BACKGROUND_LOCATION = 3
     }
 
 }

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

@@ -57,11 +57,10 @@ class TrackingService : Service() {
 
     @SuppressLint("WakelockTimeout")
     override fun onCreate() {
+        startForeground(NOTIFICATION_ID, createNotification(this))
         Log.i(TAG, "service create")
-
         sendBroadcast(Intent(ACTION_STARTED))
         StatusActivity.addMessage(getString(R.string.status_service_create))
-        startForeground(NOTIFICATION_ID, createNotification(this))
 
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
             if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(MainFragment.KEY_WAKELOCK, true)) {
@@ -89,10 +88,10 @@ class TrackingService : Service() {
     }
 
     override fun onDestroy() {
+        stopForeground(true)
         Log.i(TAG, "service destroy")
         sendBroadcast(Intent(ACTION_STOPPED))
         StatusActivity.addMessage(getString(R.string.status_service_destroy))
-        stopForeground(true)
         if (wakeLock?.isHeld == true) {
             wakeLock?.release()
         }

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

@@ -48,4 +48,6 @@
   <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Please enter a valid http:// or https:// URL</string>
   <string name="request_exception">To continuously collect location data please turn off battery optimization for the app.</string>
+  <string name="request_background">To continuously collect location data please enable \"%s\" permission.</string>
+  <string name="request_background_option">Allow all the time</string>
 </resources>

build.gradle

@@ -5,9 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }