Update hidden icon

Upgrade dependencies

.github/CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing to Traccar
+
+Please make sure you read this guide before commenting on any issue or creating a new issue or pull request.
+
+Before asking anything, please search for an answer in:
+
+- [Traccar documentation](https://www.traccar.org/documentation/)
+- [Traccar forums](https://www.traccar.org/forums/)
+- Relevant repositories (see below)
+- [Google Search](https://www.google.com/)
+
+GitHub issues should be used ONLY for feature requests, code discussions and bug reports. For general discussions please use [Traccar forums](https://www.traccar.org/forums/).
+
+There are multiple Traccar projects. If you create a new issue you MUST do it in the relevant repository:
+
+- [Traccar Server](https://github.com/tananaev/traccar/issues)
+- [Traccar Web Interface](https://github.com/tananaev/traccar-web/issues)
+- [Traccar Client for Android](https://github.com/tananaev/traccar-client-android/issues)
+- [Traccar Client for iOS](https://github.com/tananaev/traccar-client-ios/issues)
+- [Traccar Manager for Android](https://github.com/tananaev/traccar-manager-android/issues)
+- [Traccar Manager for iOS](https://github.com/tananaev/traccar-manager-ios/issues)
+
+If you are not sure where your issue belongs to, please use Traccar Server main repository.
+
+If you want to discuss something that applies to both Android and iOS apps, please use Android repository.
+
+## Bug Reports
+
+Before creating a bug report make sure that you have tested latest official release with default configuration.
+
+Only create a bug report issue if you are confident that there is a problem in Traccar software.
+
+Provide as much details as possible, including log fragments, operating system and hardware information.
+
+## Feature Requests
+
+Before creating a feature request make sure that the feature or modification that you are requesting is not yet implemented.
+
+Search reposiroty to ensure that there is no existing issues for your request. If there is, add a new comment on that issue.
+
+Provide as much details as possible, including use case for your feature and any benefits that you can think of.
+
+## Pull Requests
+
+If you want to contribute some code to Traccar, it is recommended to discuss your solution with maintainers before starting any work.
+
+Any code that you want to contribute must be of high quality and follow existing code patterns and styles.

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.traccar.org/donate/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,7 +1,7 @@
 .gradle
 .idea/
 local.properties
-traccar-client-android.iml
+*.iml
-app/app.iml
 build/
-app/build/
+.DS_Store
+google-services.json

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

README.md

@@ -1,15 +1,15 @@
 # [Traccar Client for Android](https://www.traccar.org/client)
 
-## Contacts
+[![Get it on Google Play](http://www.tananaev.com/badges/google-play.svg)](https://play.google.com/store/apps/details?id=org.traccar.client) [![Get it on F-Droid](http://www.tananaev.com/badges/f-droid.svg)](https://f-droid.org/repository/browse/?fdid=org.traccar.client)
-
-Author - Anton Tananaev ([anton.tananaev@gmail.com](mailto:anton.tananaev@gmail.com))
-
-Website - [https://www.traccar.org/client](https://www.traccar.org/client)
 
 ## Overview
 
 Traccar Client is an Android GPS tracking application. It can work with Traccar open source server software.
 
+## Team
+
+- Anton Tananaev ([anton@traccar.org](mailto:anton@traccar.org))
+
 ## License
 
     Apache License, Version 2.0

app/build.gradle

@@ -1,56 +1,80 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 33
-    buildToolsVersion '23.0.2'
 
     defaultConfig {
-        minSdkVersion 3
+        applicationId 'org.traccar.client'
-        targetSdkVersion 23
+        buildConfigField 'boolean', 'HIDDEN_APP', 'false'
-        versionCode 28
+        minSdkVersion 16
-        versionName '3.8'
+        targetSdkVersion 33
+        versionCode 81
+        versionName '7.0'
+        multiDexEnabled true
     }
+    namespace 'org.traccar.client'
 
-    signingConfigs {
+    packagingOptions {
-        release {
+        resources {
-            storeFile file('../../android.keystore')
+            excludes += ['META-INF/DEPENDENCIES']
-            keyAlias 'tananaev'
-            storePassword ''
-            keyPassword ''
         }
     }
 
+    flavorDimensions 'default'
     productFlavors {
         regular {
-            applicationId "org.traccar.client"
+            isDefault = true
-            buildConfigField "boolean", "HIDDEN_APP", "false"
         }
+        google
         hidden {
-            applicationId "org.traccar.client.hidden"
+            applicationId 'org.traccar.client.hidden'
-            buildConfigField "boolean", "HIDDEN_APP", "true"
+            buildConfigField 'boolean', 'HIDDEN_APP', 'true'
         }
     }
 
-    buildTypes {
+    testOptions {
-        release {
+        unitTests {
-            minifyEnabled false
+            includeAndroidResources = true
-            signingConfig signingConfigs.release
         }
     }
+    lint {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
+    implementation 'com.google.android.material:material:1.6.1' // wait for preference-ktx update
-    testCompile 'org.robolectric:robolectric:3.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.9.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') {
+        transitive = true
+    }
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
+    googleImplementation platform('com.google.firebase:firebase-bom:28.2.1')
+    googleImplementation 'com.google.firebase:firebase-core'
+    googleImplementation 'com.google.firebase:firebase-analytics'
+    googleImplementation 'com.google.firebase:firebase-crashlytics'
+    googleImplementation 'com.google.android.gms:play-services-location:21.0.1'
+    googleImplementation 'com.google.android.play:core:1.10.3'
 }
 
-task requestPasswords << {
+if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) {
-    android.signingConfigs.release.storePassword = new String(System.console().readPassword('\nStore password: '))
+    apply plugin: 'com.google.gms.google-services'
-    android.signingConfigs.release.keyPassword = new String(System.console().readPassword('Key password: '))
+    apply plugin: 'com.google.firebase.crashlytics'
-}
 
-tasks.whenTaskAdded { theTask ->
+    task copyJson(type: Copy) {
-    if (theTask.name.equals('packageRegularRelease') || theTask.name.equals('packageHiddenRelease')) {
+        from '../../environment/google-services'
-        theTask.dependsOn 'requestPasswords'
+        into '.'
+        include 'traccar-client-android.json'
+        rename('traccar-client-android.json', 'google-services.json')
+    }
+
+    afterEvaluate {
+        preBuild.dependsOn copyJson
     }
 }

app/src/google/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:name="org.traccar.client.GoogleMainApplication"
+        tools:replace="android:name"
+        tools:ignore="GoogleAppIndexingWarning">
+
+    </application>
+
+</manifest>

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2017 - 2021 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.app.Activity
+import android.content.IntentFilter
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.preference.PreferenceManager
+import com.google.android.play.core.review.ReviewInfo
+import com.google.android.play.core.review.ReviewManagerFactory
+import com.google.android.play.core.tasks.Task
+import com.google.firebase.analytics.FirebaseAnalytics
+
+class GoogleMainApplication : MainApplication() {
+
+    private var firebaseAnalytics: FirebaseAnalytics? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this)
+        val filter = IntentFilter()
+        filter.addAction(TrackingService.ACTION_STARTED)
+        filter.addAction(TrackingService.ACTION_STOPPED)
+        registerReceiver(ServiceReceiver(), filter)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
+    override fun handleRatingFlow(activity: Activity) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        val ratingShown = preferences.getBoolean(KEY_RATING_SHOWN, false)
+        val totalDuration = preferences.getLong(ServiceReceiver.KEY_DURATION, 0)
+        if (!ratingShown && totalDuration > RATING_THRESHOLD) {
+            val reviewManager = ReviewManagerFactory.create(activity)
+            reviewManager.requestReviewFlow().addOnCompleteListener { infoTask: Task<ReviewInfo?> ->
+                if (infoTask.isSuccessful) {
+                    val flow = reviewManager.launchReviewFlow(activity, infoTask.result)
+                    flow.addOnCompleteListener { preferences.edit().putBoolean(KEY_RATING_SHOWN, true).apply() }
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val KEY_RATING_SHOWN = "ratingShown"
+        private const val RATING_THRESHOLD = -24 * 60 * 60 * 1000L
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2019 - 2021 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.os.Looper
+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
+
+class GooglePositionProvider(context: Context, listener: PositionListener) : PositionProvider(context, listener) {
+
+    private val fusedLocationClient = LocationServices.getFusedLocationProviderClient(context)
+
+    @Suppress("DEPRECATION", "MissingPermission")
+    override fun startUpdates() {
+        val locationRequest = LocationRequest()
+        locationRequest.priority = getPriority(preferences.getString(MainFragment.KEY_ACCURACY,"medium"))
+        locationRequest.interval = if (distance > 0 || angle > 0) MINIMUM_INTERVAL else interval
+        fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, Looper.getMainLooper())
+    }
+
+    override fun stopUpdates() {
+        fusedLocationClient.removeLocationUpdates(locationCallback)
+    }
+
+    @SuppressLint("MissingPermission")
+    override fun requestSingleLocation() {
+        fusedLocationClient.lastLocation.addOnSuccessListener { location ->
+            if (location != null) {
+                listener.onPositionUpdate(Position(deviceId, location, getBatteryStatus(context)))
+            }
+        }
+    }
+
+    private val locationCallback: LocationCallback = object : LocationCallback() {
+        override fun onLocationResult(locationResult: LocationResult) {
+            for (location in locationResult.locations) {
+                processLocation(location)
+            }
+        }
+    }
+
+    private fun getPriority(accuracy: String?): Int {
+        return when (accuracy) {
+            "high" -> LocationRequest.PRIORITY_HIGH_ACCURACY
+            "low"  -> LocationRequest.PRIORITY_LOW_POWER
+            else   -> LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 - 2021 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
+import org.traccar.client.PositionProvider.PositionListener
+
+object PositionProviderFactory {
+
+    fun create(context: Context, listener: PositionListener): PositionProvider {
+        return GooglePositionProvider(context, listener)
+    }
+}

app/src/google/java/org/traccar/client/ServiceReceiver.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020 - 2021 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.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.preference.PreferenceManager
+
+class ServiceReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (TrackingService.ACTION_STARTED == intent.action) {
+            startTime = System.currentTimeMillis()
+        } else if (startTime > 0) {
+            updateTime(context, System.currentTimeMillis() - startTime)
+            startTime = 0
+        }
+    }
+
+    private fun updateTime(context: Context, duration: Long) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val totalDuration = preferences.getLong(KEY_DURATION, 0)
+        preferences.edit().putLong(KEY_DURATION, totalDuration + duration).apply()
+    }
+
+    companion object {
+        const val KEY_DURATION = "serviceTime"
+        private var startTime: Long = 0
+    }
+}

app/src/hidden/AndroidManifest.xml

@@ -6,9 +6,22 @@
 
     <application
         android:label="@string/hidden_app_name"
-        tools:replace="label">
+        tools:replace="android:label">
 
-        <receiver android:name=".DialLaunchReceiver" >
+        <activity
+            android:name="org.traccar.client.MainActivity"
+            android:exported="true">
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="www.traccar.org" android:pathPrefix="/hidden" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name="org.traccar.client.DialLaunchReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.NEW_OUTGOING_CALL" />
             </intent-filter>

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 - 2021 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
+import org.traccar.client.PositionProvider.PositionListener
+
+object PositionProviderFactory {
+
+    fun create(context: Context, listener: PositionListener): PositionProvider {
+        return AndroidPositionProvider(context, listener)
+    }
+}

app/src/hidden/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="5.04"
+      android:translateY="5.04">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+  </group>
+</vector>

app/src/hidden/res/drawable/ic_stat_notify.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
+</vector>

app/src/hidden/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -1,51 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
-    package="org.traccar.client">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <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" />
     <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" />
 
+    <uses-permission android:name="oppo.permission.OPPO_COMPONENT_SAFE" />
+    <uses-permission android:name="com.huawei.permission.external_app_settings.USE_COMPONENT" />
+
+    <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"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/TraccarTheme">
+        android:theme="@style/AppTheme"
+        android:name=".MainApplication"
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
 
-        <activity android:name=".MainActivity" android:launchMode="singleTask" />
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTask" />
 
         <activity-alias
             android:name=".Launcher"
+            android:exported="true"
             android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity-alias>
 
-        <activity android:name=".StatusActivity"/>
+        <activity
-
+            android:name=".StatusActivity"
-        <activity android:name=".AboutActivity"/>
+            android:exported="false" />
 
         <activity
-            android:name=".ShortcutActivity">
+            android:name=".ShortcutActivity"
+            android:exported="true"
+            android:label="@string/menu_shortcuts">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
             </intent-filter>
         </activity>
 
-        <service android:name=".TrackingService" />
+        <service
+            android:name=".TrackingService"
+            android:exported="false"
+            android:foregroundServiceType="location" />
 
-        <service android:name=".TrackingService$HideNotificationService" />
+        <service
+            android:name=".TrackingService$HideNotificationService"
+            android:exported="false" />
 
-        <receiver android:name=".AutostartReceiver">
+        <receiver
+            android:name=".AutostartReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
         </receiver>
 
     </application>

app/src/main/java/android/support/v4/content/WakefulBroadcastReceiver.java

@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * 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 android.support.v4.content;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.PowerManager;
-import android.util.Log;
-import android.util.SparseArray;
-
-/**
- * Helper for the common pattern of implementing a {@link BroadcastReceiver}
- * that receives a device wakeup event and then passes the work off
- * to a {@link android.app.Service}, while ensuring that the
- * device does not go back to sleep during the transition.
- *
- * <p>This class takes care of creating and managing a partial wake lock
- * for you; you must request the {@link android.Manifest.permission#WAKE_LOCK}
- * permission to use it.</p>
- *
- * <h3>Example</h3>
- *
- * <p>A {@link WakefulBroadcastReceiver} uses the method
- * {@link WakefulBroadcastReceiver#startWakefulService startWakefulService()}
- * to start the service that does the work. This method is comparable to
- * {@link android.content.Context#startService startService()}, except that
- * the {@link WakefulBroadcastReceiver} is holding a wake lock when the service
- * starts. The intent that is passed with
- * {@link WakefulBroadcastReceiver#startWakefulService startWakefulService()}
- * holds an extra identifying the wake lock.</p>
- *
- * {@sample development/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulReceiver.java complete}
- *
- * <p>The service (in this example, an {@link android.app.IntentService}) does
- * some work. When it is finished, it releases the wake lock by calling
- * {@link WakefulBroadcastReceiver#completeWakefulIntent
- * completeWakefulIntent(intent)}. The intent it passes as a parameter
- * is the same intent that the {@link WakefulBroadcastReceiver} originally
- * passed in.</p>
- *
- * {@sample development/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulService.java complete}
- */
-public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
-    private static final String EXTRA_WAKE_LOCK_ID = "android.support.content.wakelockid";
-
-    private static final SparseArray<PowerManager.WakeLock> mActiveWakeLocks
-            = new SparseArray<PowerManager.WakeLock>();
-    private static int mNextId = 1;
-
-    /**
-     * Do a {@link android.content.Context#startService(android.content.Intent)
-     * Context.startService}, but holding a wake lock while the service starts.
-     * This will modify the Intent to hold an extra identifying the wake lock;
-     * when the service receives it in {@link android.app.Service#onStartCommand
-     * Service.onStartCommand}, it should pass back the Intent it receives there to
-     * {@link #completeWakefulIntent(android.content.Intent)} in order to release
-     * the wake lock.
-     *
-     * @param context The Context in which it operate.
-     * @param intent The Intent with which to start the service, as per
-     * {@link android.content.Context#startService(android.content.Intent)
-     * Context.startService}.
-     */
-    public static ComponentName startWakefulService(Context context, Intent intent) {
-        synchronized (mActiveWakeLocks) {
-            int id = mNextId;
-            mNextId++;
-            if (mNextId <= 0) {
-                mNextId = 1;
-            }
-
-            intent.putExtra(EXTRA_WAKE_LOCK_ID, id);
-            ComponentName comp = context.startService(intent);
-            if (comp == null) {
-                return null;
-            }
-
-            PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
-            PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                    "wake:" + comp.flattenToShortString());
-            wl.setReferenceCounted(false);
-            wl.acquire(60*1000);
-            mActiveWakeLocks.put(id, wl);
-            return comp;
-        }
-    }
-
-    /**
-     * Finish the execution from a previous {@link #startWakefulService}.  Any wake lock
-     * that was being held will now be released.
-     *
-     * @param intent The Intent as originally generated by {@link #startWakefulService}.
-     * @return Returns true if the intent is associated with a wake lock that is
-     * now released; returns false if there was no wake lock specified for it.
-     */
-    public static boolean completeWakefulIntent(Intent intent) {
-        final int id = intent.getIntExtra(EXTRA_WAKE_LOCK_ID, 0);
-        if (id == 0) {
-            return false;
-        }
-        synchronized (mActiveWakeLocks) {
-            PowerManager.WakeLock wl = mActiveWakeLocks.get(id);
-            if (wl != null) {
-                wl.release();
-                mActiveWakeLocks.remove(id);
-                return true;
-            }
-            // We return true whether or not we actually found the wake lock
-            // the return code is defined to indicate whether the Intent contained
-            // an identifier for a wake lock that it was supposed to match.
-            // We just log a warning here if there is no wake lock found, which could
-            // happen for example if this function is called twice on the same
-            // intent or the process is killed and restarted before processing the intent.
-            Log.w("WakefulBroadcastReceive", "No active wake lock id #" + id);
-            return true;
-        }
-    }
-}

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

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

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019 - 2021 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
+
+class AndroidPositionProvider(context: Context, listener: PositionListener) : PositionProvider(context, listener), LocationListener {
+
+    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    private val provider = getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium"))
+
+    @SuppressLint("MissingPermission")
+    override fun startUpdates() {
+        try {
+            locationManager.requestLocationUpdates(
+                    provider, if (distance > 0 || angle > 0) MINIMUM_INTERVAL else interval, 0f, this)
+        } catch (e: RuntimeException) {
+            listener.onPositionError(e)
+        }
+    }
+
+    override fun stopUpdates() {
+        locationManager.removeUpdates(this)
+    }
+
+    @Suppress("DEPRECATION", "MissingPermission")
+    override fun requestSingleLocation() {
+        try {
+            val location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER)
+            if (location != null) {
+                listener.onPositionUpdate(Position(deviceId, location, getBatteryStatus(context)))
+            } else {
+                locationManager.requestSingleUpdate(provider, object : LocationListener {
+                    override fun onLocationChanged(location: Location) {
+                        listener.onPositionUpdate(Position(deviceId, location, getBatteryStatus(context)))
+                    }
+
+                    override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
+                    override fun onProviderEnabled(provider: String) {}
+                    override fun onProviderDisabled(provider: String) {}
+                }, Looper.myLooper())
+            }
+        } catch (e: RuntimeException) {
+            listener.onPositionError(e)
+        }
+    }
+
+    override fun onLocationChanged(location: Location) {
+        processLocation(location)
+    }
+
+    override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
+    override fun onProviderEnabled(provider: String) {}
+    override fun onProviderDisabled(provider: String) {}
+
+    private fun getProvider(accuracy: String?): String {
+        return when (accuracy) {
+            "high" -> LocationManager.GPS_PROVIDER
+            "low"  -> LocationManager.PASSIVE_PROVIDER
+            else   -> LocationManager.NETWORK_PROVIDER
+        }
+    }
+
+}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright 2013 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.
- * 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;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.v4.content.WakefulBroadcastReceiver;
-
-public class AutostartReceiver extends WakefulBroadcastReceiver {
-    
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
-            startWakefulService(context, new Intent(context, TrackingService.class));
-        }
-    }
-
-}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 - 2021 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
+import android.content.Intent
+import androidx.preference.PreferenceManager
+
+class AutostartReceiver : WakefulBroadcastReceiver() {
+
+    @Suppress("UnsafeProtectedBroadcastReceiver")
+    override fun onReceive(context: Context, intent: Intent) {
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        if (sharedPreferences.getBoolean(MainFragment.KEY_STATUS, false)) {
+            startWakefulForegroundService(context, Intent(context, TrackingService::class.java))
+        }
+    }
+
+}

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2021 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.ActivityNotFoundException
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceManager
+import com.judemanutd.autostarter.AutoStartPermissionHelper
+
+class BatteryOptimizationHelper {
+
+    private fun showDialog(context: Context, onSuccess: () -> Unit) {
+        val builder = AlertDialog.Builder(context)
+        builder.setMessage(context.getString(R.string.request_exception))
+        builder.setPositiveButton(android.R.string.ok) { _, _ -> onSuccess() }
+        builder.setNegativeButton(android.R.string.cancel, null)
+        builder.show()
+    }
+
+    private fun requestVendorException(context: Context) {
+        val vendorIntentList = listOf(
+            Intent().setComponent(ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")),
+            Intent().setComponent(ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.AutobootManageActivity")),
+            Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.startupmgr.ui.StartupNormalAppListActivity")),
+            Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.optimize.process.ProtectActivity")),
+            Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.appcontrol.activity.StartupAppControlActivity")),
+            Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity")),
+            Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.startupapp.StartupAppListActivity")),
+            Intent().setComponent(ComponentName("com.oppo.safe", "com.oppo.safe.permission.startup.StartupAppListActivity")),
+            Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.AddWhiteListActivity")),
+            Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.BgStartUpManager")),
+            Intent().setComponent(ComponentName("com.vivo.permissionmanager", "com.vivo.permissionmanager.activity.BgStartUpManagerActivity")),
+            Intent().setComponent(ComponentName("com.samsung.android.lool", "com.samsung.android.sm.ui.battery.BatteryActivity")),
+            Intent().setComponent(ComponentName("com.htc.pitroad", "com.htc.pitroad.landingpage.activity.LandingPageActivity")),
+            Intent().setComponent(ComponentName("com.asus.mobilemanager", "com.asus.mobilemanager.MainActivity")),
+        )
+        for (vendorIntent in vendorIntentList) {
+            if (context.packageManager.resolveActivity(vendorIntent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
+                try {
+                    context.startActivity(vendorIntent)
+                    return
+                } catch (e: Exception) {
+                    continue
+                }
+            }
+        }
+    }
+
+    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)) {
+                sharedPreferences.edit().putBoolean(KEY_EXCEPTION_REQUESTED, true).apply()
+                val powerManager = context.getSystemService(PowerManager::class.java)
+                if (!powerManager.isIgnoringBatteryOptimizations(context.packageName)) {
+                    showDialog(context) {
+                        try {
+                            context.startActivity(Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS))
+                        } catch (e: ActivityNotFoundException) {
+                            requestVendorException(context)
+                        }
+                    }
+                    return true
+                }
+            } else if (!sharedPreferences.getBoolean(KEY_AUTOSTART_REQUESTED, false)) {
+                sharedPreferences.edit().putBoolean(KEY_AUTOSTART_REQUESTED, true).apply()
+                try {
+                    if (AutoStartPermissionHelper.getInstance().getAutoStartPermission(context)) {
+                        return true
+                    }
+                } catch (e: SecurityException) {
+                }
+            }
+        }
+        return false
+    }
+
+    companion object {
+        private const val KEY_EXCEPTION_REQUESTED = "exceptionRequested"
+        private const val KEY_AUTOSTART_REQUESTED = "autostartRequested"
+    }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 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
+
+data class BatteryStatus(
+    val level: Double = 0.0,
+    val charging: Boolean = false,
+)

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

@@ -1,169 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.os.AsyncTask;
-
-import java.util.Date;
-
-public class DatabaseHelper extends SQLiteOpenHelper {
-
-    public static final int DATABASE_VERSION = 1;
-    public static final String DATABASE_NAME = "traccar.db";
-
-    public interface DatabaseHandler<T> {
-        void onComplete(boolean success, T result);
-    }
-
-    private static abstract class DatabaseAsyncTask<T> extends AsyncTask<Void, Void, T> {
-
-        private DatabaseHandler<T> handler;
-        private RuntimeException error;
-
-        public DatabaseAsyncTask(DatabaseHandler<T> handler) {
-            this.handler = handler;
-        }
-
-        @Override
-        protected T doInBackground(Void... params) {
-            try {
-                return executeMethod();
-            } catch (RuntimeException error) {
-                this.error = error;
-                return null;
-            }
-        }
-
-        protected abstract T executeMethod();
-
-        @Override
-        protected void onPostExecute(T result) {
-            handler.onComplete(error == null, result);
-        }
-    }
-
-    private SQLiteDatabase db;
-
-    public DatabaseHelper(Context context) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        db = getWritableDatabase();
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL("CREATE TABLE position (" +
-                "id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "deviceId TEXT," +
-                "time INTEGER," +
-                "latitude REAL," +
-                "longitude REAL," +
-                "altitude REAL," +
-                "speed REAL," +
-                "course REAL," +
-                "battery REAL)");
-    }
-
-    @Override
-    public void onUpgrade(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());
-        values.put("time", position.getTime().getTime());
-        values.put("latitude", position.getLatitude());
-        values.put("longitude", position.getLongitude());
-        values.put("altitude", position.getAltitude());
-        values.put("speed", position.getSpeed());
-        values.put("course", position.getCourse());
-        values.put("battery", position.getBattery());
-
-        db.insertOrThrow("position", null, values);
-    }
-
-    public void insertPositionAsync(final Position position, DatabaseHandler<Void> handler) {
-        new DatabaseAsyncTask<Void>(handler) {
-            @Override
-            protected Void executeMethod() {
-                insertPosition(position);
-                return null;
-            }
-        }.execute();
-    }
-
-    public Position selectPosition() {
-        Position position = new Position();
-
-        Cursor cursor = db.rawQuery("SELECT * FROM position ORDER BY id LIMIT 1", null);
-        try {
-            if (cursor.getCount() > 0) {
-
-                cursor.moveToFirst();
-
-                position.setId(cursor.getLong(cursor.getColumnIndex("id")));
-                position.setDeviceId(cursor.getString(cursor.getColumnIndex("deviceId")));
-                position.setTime(new Date(cursor.getLong(cursor.getColumnIndex("time"))));
-                position.setLatitude(cursor.getDouble(cursor.getColumnIndex("latitude")));
-                position.setLongitude(cursor.getDouble(cursor.getColumnIndex("longitude")));
-                position.setAltitude(cursor.getDouble(cursor.getColumnIndex("altitude")));
-                position.setSpeed(cursor.getDouble(cursor.getColumnIndex("speed")));
-                position.setCourse(cursor.getDouble(cursor.getColumnIndex("course")));
-                position.setBattery(cursor.getDouble(cursor.getColumnIndex("battery")));
-
-            } else {
-                return null;
-            }
-        } finally {
-            cursor.close();
-        }
-
-        return position;
-    }
-
-    public void selectPositionAsync(DatabaseHandler<Position> handler) {
-        new DatabaseAsyncTask<Position>(handler) {
-            @Override
-            protected Position executeMethod() {
-                return selectPosition();
-            }
-        }.execute();
-    }
-
-    public void deletePosition(long id) {
-        if (db.delete("position", "id = ?", new String[] { String.valueOf(id) }) != 1) {
-            throw new SQLException();
-        }
-    }
-
-    public void deletePositionAsync(final long id, DatabaseHandler<Void> handler) {
-        new DatabaseAsyncTask<Void>(handler) {
-            @Override
-            protected Void executeMethod() {
-                deletePosition(id);
-                return null;
-            }
-        }.execute();
-    }
-
-}

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

@@ -0,0 +1,159 @@
+/*
+ * Copyright 2015 - 2022 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.
+ */
+@file:Suppress("DEPRECATION", "StaticFieldLeak")
+package org.traccar.client
+
+import android.annotation.SuppressLint
+import android.content.ContentValues
+import android.content.Context
+import android.database.SQLException
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+import android.os.AsyncTask
+import java.sql.Date
+
+class DatabaseHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
+
+    interface DatabaseHandler<T> {
+        fun onComplete(success: Boolean, result: T)
+    }
+
+    private abstract class DatabaseAsyncTask<T>(val handler: DatabaseHandler<T?>) : AsyncTask<Unit, Unit, T?>() {
+
+        private var error: RuntimeException? = null
+
+        override fun doInBackground(vararg params: Unit): T? {
+            return try {
+                executeMethod()
+            } catch (error: RuntimeException) {
+                this.error = error
+                null
+            }
+        }
+
+        protected abstract fun executeMethod(): T
+
+        override fun onPostExecute(result: T?) {
+            handler.onComplete(error == null, result)
+        }
+    }
+
+    private val db: SQLiteDatabase = writableDatabase
+
+    override fun onCreate(db: SQLiteDatabase) {
+        db.execSQL(
+            "CREATE TABLE position (" +
+                    "id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "deviceId TEXT," +
+                    "time INTEGER," +
+                    "latitude REAL," +
+                    "longitude REAL," +
+                    "altitude REAL," +
+                    "speed REAL," +
+                    "course REAL," +
+                    "accuracy REAL," +
+                    "battery REAL," +
+                    "charging INTEGER," +
+                    "mock INTEGER)"
+        )
+    }
+
+    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+        db.execSQL("DROP TABLE IF EXISTS position;")
+        onCreate(db)
+    }
+
+    override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+        db.execSQL("DROP TABLE IF EXISTS position;")
+        onCreate(db)
+    }
+
+    fun insertPosition(position: Position) {
+        val values = ContentValues()
+        values.put("deviceId", position.deviceId)
+        values.put("time", position.time.time)
+        values.put("latitude", position.latitude)
+        values.put("longitude", position.longitude)
+        values.put("altitude", position.altitude)
+        values.put("speed", position.speed)
+        values.put("course", position.course)
+        values.put("accuracy", position.accuracy)
+        values.put("battery", position.battery)
+        values.put("charging", if (position.charging) 1 else 0)
+        values.put("mock", if (position.mock) 1 else 0)
+        db.insertOrThrow("position", null, values)
+    }
+
+    fun insertPositionAsync(position: Position, handler: DatabaseHandler<Unit?>) {
+        object : DatabaseAsyncTask<Unit>(handler) {
+            override fun executeMethod() {
+                insertPosition(position)
+            }
+        }.execute()
+    }
+
+    @SuppressLint("Range")
+    fun selectPosition(): Position? {
+        db.rawQuery("SELECT * FROM position ORDER BY id LIMIT 1", null).use { cursor ->
+            if (cursor.count > 0) {
+                cursor.moveToFirst()
+                return Position(
+                    id = cursor.getLong(cursor.getColumnIndex("id")),
+                    deviceId = cursor.getString(cursor.getColumnIndex("deviceId")),
+                    time = Date(cursor.getLong(cursor.getColumnIndex("time"))),
+                    latitude = cursor.getDouble(cursor.getColumnIndex("latitude")),
+                    longitude = cursor.getDouble(cursor.getColumnIndex("longitude")),
+                    altitude = cursor.getDouble(cursor.getColumnIndex("altitude")),
+                    speed = cursor.getDouble(cursor.getColumnIndex("speed")),
+                    course = cursor.getDouble(cursor.getColumnIndex("course")),
+                    accuracy = cursor.getDouble(cursor.getColumnIndex("accuracy")),
+                    battery = cursor.getDouble(cursor.getColumnIndex("battery")),
+                    charging = cursor.getInt(cursor.getColumnIndex("charging")) > 0,
+                    mock = cursor.getInt(cursor.getColumnIndex("mock")) > 0,
+                )
+            }
+        }
+        return null
+    }
+
+    fun selectPositionAsync(handler: DatabaseHandler<Position?>) {
+        object : DatabaseAsyncTask<Position?>(handler) {
+            override fun executeMethod(): Position? {
+                return selectPosition()
+            }
+        }.execute()
+    }
+
+    fun deletePosition(id: Long) {
+        if (db.delete("position", "id = ?", arrayOf(id.toString())) != 1) {
+            throw SQLException()
+        }
+    }
+
+    fun deletePositionAsync(id: Long, handler: DatabaseHandler<Unit?>) {
+        object : DatabaseAsyncTask<Unit>(handler) {
+            override fun executeMethod() {
+                deletePosition(id)
+            }
+        }.execute()
+    }
+
+    companion object {
+        const val DATABASE_VERSION = 4
+        const val DATABASE_NAME = "traccar.db"
+    }
+
+}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class DialLaunchReceiver extends BroadcastReceiver {
-
-    private static final String LAUNCHER_NUMBER = "8722227"; // TRACCAR
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
-        if (phoneNumber.equals(LAUNCHER_NUMBER)) {
-            setResultData(null);
-            Intent appIntent = new Intent(context, MainActivity.class);
-            appIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(appIntent);
-        }
-    }
-
-}

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 - 2021 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.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class DialLaunchReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER)
+        if (phoneNumber == LAUNCHER_NUMBER) {
+            resultData = null
+            val appIntent = Intent(context, MainActivity::class.java)
+            appIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(appIntent)
+        }
+    }
+
+    companion object {
+        private const val LAUNCHER_NUMBER = "8722227" // TRACCAR
+    }
+
+}

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

@@ -1,265 +0,0 @@
-/*
- * Copyright 2012 - 2016 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.
- * 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.Manifest;
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
-import android.preference.TwoStatePreference;
-import android.util.Patterns;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-
-@SuppressWarnings("deprecation")
-public class MainActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
-
-    public static final String KEY_DEVICE = "id";
-    public static final String KEY_ADDRESS = "address";
-    public static final String KEY_PORT = "port";
-    public static final String KEY_INTERVAL = "interval";
-    public static final String KEY_PROVIDER = "provider";
-    public static final String KEY_STATUS = "status";
-
-    private static final int PERMISSIONS_REQUEST_LOCATION = 2;
-
-    private SharedPreferences sharedPreferences;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (BuildConfig.HIDDEN_APP) {
-            removeLauncherIcon();
-        }
-
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        addPreferencesFromResource(R.xml.preferences);
-        initPreferences();
-
-        findPreference(KEY_DEVICE).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                return newValue != null && !newValue.equals("");
-            }
-        });
-        findPreference(KEY_ADDRESS).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
-                    return newValue != null && Patterns.DOMAIN_NAME.matcher((String) newValue).matches();
-                } else {
-                    return newValue != null && !((String) newValue).isEmpty();
-                }
-            }
-        });
-        findPreference(KEY_PORT).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (newValue != null) {
-                    try {
-                        int value = Integer.parseInt((String) newValue);
-                        if (value > 0 && value <= 65536) {
-                            return true;
-                        }
-                    } catch (NumberFormatException e) {
-                    }
-                }
-                return false;
-            }
-        });
-        findPreference(KEY_INTERVAL).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (newValue != null) {
-                    try {
-                        Integer.parseInt((String) newValue);
-                        return true;
-                    } catch (NumberFormatException e) {
-                    }
-                }
-                return false;
-            }
-        });
-
-        if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
-            startTrackingService(true, false);
-        }
-    }
-
-    private void removeLauncherIcon() {
-        String className = MainActivity.class.getCanonicalName().replace(".MainActivity", ".Launcher");
-        ComponentName componentName = new ComponentName(getPackageName(), className);
-        PackageManager packageManager = getPackageManager();
-        if (packageManager.getComponentEnabledSetting(componentName) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
-            packageManager.setComponentEnabledSetting(
-                    componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setIcon(android.R.drawable.ic_dialog_alert);
-            builder.setMessage(getString(R.string.hidden_alert));
-            builder.setPositiveButton(android.R.string.ok, null);
-            builder.show();
-        }
-    }
-
-    private void addShortcuts(boolean start, int name) {
-        Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
-        shortcutIntent.setComponent(new ComponentName(getPackageName(), ".ShortcutActivity"));
-        shortcutIntent.putExtra(ShortcutActivity.EXTRA_ACTION, start);
-
-        Intent installShortCutIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
-        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(name));
-        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher));
-
-        sendBroadcast(installShortCutIntent);
-    }
-
-    private boolean hasPermission(String permission) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return true;
-        }
-        return checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        sharedPreferences.registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
-    }
-
-    private void setPreferencesEnabled(boolean enabled) {
-        findPreference(KEY_DEVICE).setEnabled(enabled);
-        findPreference(KEY_ADDRESS).setEnabled(enabled);
-        findPreference(KEY_PORT).setEnabled(enabled);
-        findPreference(KEY_INTERVAL).setEnabled(enabled);
-        findPreference(KEY_PROVIDER).setEnabled(enabled);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(KEY_STATUS)) {
-            if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
-                startTrackingService(true, false);
-            } else {
-                stopTrackingService();
-            }
-        } else if (key.equals(KEY_DEVICE)) {
-            findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.status) {
-            startActivity(new Intent(this, StatusActivity.class));
-            return true;
-        } else if (item.getItemId() == R.id.shortcuts) {
-            addShortcuts(true, R.string.shortcut_start);
-            addShortcuts(false, R.string.shortcut_stop);
-            return true;
-        } else if (item.getItemId() == R.id.about) {
-            startActivity(new Intent(this, AboutActivity.class));
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void initPreferences() {
-        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
-
-        if (!sharedPreferences.contains(KEY_DEVICE)) {
-            String id = String.valueOf(new Random().nextInt(900000) + 100000);
-            sharedPreferences.edit().putString(KEY_DEVICE, id).commit();
-            ((EditTextPreference) findPreference(KEY_DEVICE)).setText(id);
-        }
-        findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
-    }
-
-    private void startTrackingService(boolean checkPermission, boolean permission) {
-        if (checkPermission) {
-            Set<String> missingPermissions = new HashSet<>();
-            if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
-                missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
-            }
-            if (!hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
-                missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
-            }
-            if (missingPermissions.isEmpty()) {
-                permission = true;
-            } else {
-                requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]), PERMISSIONS_REQUEST_LOCATION);
-                return;
-            }
-        }
-
-        if (permission) {
-            setPreferencesEnabled(false);
-            startService(new Intent(this, TrackingService.class));
-        } else {
-            sharedPreferences.edit().putBoolean(KEY_STATUS, false).commit();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                TwoStatePreference preference = (TwoStatePreference) findPreference(KEY_STATUS);
-                preference.setChecked(false);
-            } else {
-                CheckBoxPreference preference = (CheckBoxPreference) findPreference(KEY_STATUS);
-                preference.setChecked(false);
-            }
-        }
-    }
-
-    private void stopTrackingService() {
-        stopService(new Intent(this, TrackingService.class));
-        setPreferencesEnabled(true);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
-            startTrackingService(false, grantResults[0] == PackageManager.PERMISSION_GRANTED &&
-                    (permissions.length < 2 || grantResults[1] == PackageManager.PERMISSION_GRANTED));
-        }
-    }
-
-}

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

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017 - 2021 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 androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.main)
+    }
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 - 2021 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 androidx.multidex.MultiDexApplication
+import android.annotation.TargetApi
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.Notification
+import android.graphics.Color
+import android.os.Build
+import android.app.Activity
+
+open class MainApplication : MultiDexApplication() {
+
+    override fun onCreate() {
+        super.onCreate()
+        System.setProperty("http.keepAliveDuration", (30 * 60 * 1000).toString())
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerChannel()
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private fun registerChannel() {
+        val channel = NotificationChannel(
+            PRIMARY_CHANNEL, getString(R.string.channel_default), NotificationManager.IMPORTANCE_LOW
+        )
+        channel.lightColor = Color.GREEN
+        channel.lockscreenVisibility = Notification.VISIBILITY_SECRET
+        (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(channel)
+    }
+
+    open fun handleRatingFlow(activity: Activity) {}
+
+    companion object {
+        const val PRIMARY_CHANNEL = "default"
+    }
+
+}

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

@@ -0,0 +1,330 @@
+/*
+ * Copyright 2012 - 2022 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.Manifest
+import android.annotation.SuppressLint
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.text.InputType
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.webkit.URLUtil
+import android.widget.EditText
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.preference.EditTextPreference
+import androidx.preference.EditTextPreferenceDialogFragmentCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import androidx.preference.TwoStatePreference
+import dev.doubledot.doki.ui.DokiActivity
+import java.util.*
+import kotlin.collections.HashSet
+
+class MainFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener {
+
+    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?) {
+        if (BuildConfig.HIDDEN_APP && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            removeLauncherIcon()
+        }
+        setHasOptionsMenu(true)
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        setPreferencesFromResource(R.xml.preferences, rootKey)
+        initPreferences()
+
+        findPreference<Preference>(KEY_DEVICE)?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            newValue != null && newValue != ""
+        }
+        findPreference<Preference>(KEY_URL)?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            newValue != null && validateServerURL(newValue.toString())
+        }
+        findPreference<Preference>(KEY_INTERVAL)?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            try {
+                newValue != null && (newValue as String).toInt() > 0
+            } catch (e: NumberFormatException) {
+                Log.w(TAG, e)
+                false
+            }
+        }
+        val numberValidationListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            try {
+                newValue != null && (newValue as String).toInt() >= 0
+            } catch (e: NumberFormatException) {
+                Log.w(TAG, e)
+                false
+            }
+        }
+        findPreference<Preference>(KEY_DISTANCE)?.onPreferenceChangeListener = numberValidationListener
+        findPreference<Preference>(KEY_ANGLE)?.onPreferenceChangeListener = numberValidationListener
+
+        alarmManager = requireActivity().getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        val originalIntent = Intent(activity, AutostartReceiver::class.java)
+        originalIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+        alarmIntent = PendingIntent.getBroadcast(activity, 0, originalIntent, flags)
+
+        if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
+            startTrackingService(checkPermission = true, initialPermission = false)
+        }
+    }
+
+    class NumericEditTextPreferenceDialogFragment : EditTextPreferenceDialogFragmentCompat() {
+
+        override fun onBindDialogView(view: View) {
+            val editText = view.findViewById<EditText>(android.R.id.edit)
+            editText.inputType = InputType.TYPE_CLASS_NUMBER
+            super.onBindDialogView(view)
+        }
+
+        companion object {
+            fun newInstance(key: String?): NumericEditTextPreferenceDialogFragment {
+                val fragment = NumericEditTextPreferenceDialogFragment()
+                val bundle = Bundle()
+                bundle.putString(ARG_KEY, key)
+                fragment.arguments = bundle
+                return fragment
+            }
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    override fun onDisplayPreferenceDialog(preference: Preference) {
+        if (listOf(KEY_INTERVAL, KEY_DISTANCE, KEY_ANGLE).contains(preference.key)) {
+            val f: EditTextPreferenceDialogFragmentCompat =
+                NumericEditTextPreferenceDialogFragment.newInstance(preference.key)
+            f.setTargetFragment(this, 0)
+            f.show(requireFragmentManager(), "androidx.preference.PreferenceFragment.DIALOG")
+        } else {
+            super.onDisplayPreferenceDialog(preference)
+        }
+    }
+
+    private fun removeLauncherIcon() {
+        val className = MainActivity::class.java.canonicalName!!.replace(".MainActivity", ".Launcher")
+        val componentName = ComponentName(requireActivity().packageName, className)
+        val packageManager = requireActivity().packageManager
+        if (packageManager.getComponentEnabledSetting(componentName) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            packageManager.setComponentEnabledSetting(
+                componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP
+            )
+            val builder = AlertDialog.Builder(requireActivity())
+            builder.setIcon(android.R.drawable.ic_dialog_alert)
+            builder.setMessage(getString(R.string.hidden_alert))
+            builder.setPositiveButton(android.R.string.ok, null)
+            builder.show()
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (requestingPermissions) {
+            requestingPermissions = BatteryOptimizationHelper().requestException(requireContext())
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    private fun setPreferencesEnabled(enabled: Boolean) {
+        findPreference<Preference>(KEY_DEVICE)?.isEnabled = enabled
+        findPreference<Preference>(KEY_URL)?.isEnabled = enabled
+        findPreference<Preference>(KEY_INTERVAL)?.isEnabled = enabled
+        findPreference<Preference>(KEY_DISTANCE)?.isEnabled = enabled
+        findPreference<Preference>(KEY_ANGLE)?.isEnabled = enabled
+        findPreference<Preference>(KEY_ACCURACY)?.isEnabled = enabled
+        findPreference<Preference>(KEY_BUFFER)?.isEnabled = enabled
+        findPreference<Preference>(KEY_WAKELOCK)?.isEnabled = enabled
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        if (key == KEY_STATUS) {
+            if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
+                startTrackingService(checkPermission = true, initialPermission = false)
+            } else {
+                stopTrackingService()
+            }
+            (requireActivity().application as MainApplication).handleRatingFlow(requireActivity())
+        } else if (key == KEY_DEVICE) {
+            findPreference<Preference>(KEY_DEVICE)?.summary = sharedPreferences.getString(KEY_DEVICE, null)
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.main, menu)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.status) {
+            startActivity(Intent(activity, StatusActivity::class.java))
+            return true
+        } else if (item.itemId == R.id.info) {
+            DokiActivity.start(requireContext())
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun initPreferences() {
+        PreferenceManager.setDefaultValues(requireActivity(), R.xml.preferences, false)
+        if (!sharedPreferences.contains(KEY_DEVICE)) {
+            val id = (Random().nextInt(900000) + 100000).toString()
+            sharedPreferences.edit().putString(KEY_DEVICE, id).apply()
+            findPreference<EditTextPreference>(KEY_DEVICE)?.text = id
+        }
+        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) {
+            val requiredPermissions: MutableSet<String> = HashSet()
+            if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requiredPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION)
+            }
+            permission = requiredPermissions.isEmpty()
+            if (!permission) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    requestPermissions(requiredPermissions.toTypedArray(), PERMISSIONS_REQUEST_LOCATION)
+                }
+                return
+            }
+        }
+        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
+                )
+            }
+
+            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)
+            preference?.isChecked = false
+        }
+    }
+
+    private fun stopTrackingService() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            alarmManager.cancel(alarmIntent)
+        }
+        requireActivity().stopService(Intent(activity, TrackingService::class.java))
+        setPreferencesEnabled(true)
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
+            var granted = true
+            for (result in grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    granted = false
+                    break
+                }
+            }
+            startTrackingService(false, granted)
+        }
+    }
+
+    private fun validateServerURL(userUrl: String): Boolean {
+        val port = Uri.parse(userUrl).port
+        if (
+            URLUtil.isValidUrl(userUrl) &&
+            (port == -1 || port in 1..65535) &&
+            (URLUtil.isHttpUrl(userUrl) || URLUtil.isHttpsUrl(userUrl))
+        ) {
+            return true
+        }
+        Toast.makeText(activity, R.string.error_msg_invalid_url, Toast.LENGTH_LONG).show()
+        return false
+    }
+
+    companion object {
+        private val TAG = MainFragment::class.java.simpleName
+        private const val ALARM_MANAGER_INTERVAL = 15000
+        const val KEY_DEVICE = "id"
+        const val KEY_URL = "url"
+        const val KEY_INTERVAL = "interval"
+        const val KEY_DISTANCE = "distance"
+        const val KEY_ANGLE = "angle"
+        const val KEY_ACCURACY = "accuracy"
+        const val KEY_STATUS = "status"
+        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/MixedPositionProvider.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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;
-import android.location.GpsStatus;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-import android.util.Log;
-
-public class MixedPositionProvider extends PositionProvider implements LocationListener, GpsStatus.Listener {
-
-    private static int FIX_TIMEOUT = 30 * 1000;
-
-    private LocationListener backupListener;
-    private long lastFixTime;
-
-    public MixedPositionProvider(Context context, PositionListener listener) {
-        super(context, listener);
-    }
-
-    public void startUpdates() {
-        lastFixTime = System.currentTimeMillis();
-        locationManager.addGpsStatusListener(this);
-        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, this);
-    }
-
-    public void stopUpdates() {
-        locationManager.removeUpdates(this);
-        locationManager.removeGpsStatusListener(this);
-        stopBackupProvider();
-    }
-
-    private void startBackupProvider() {
-        Log.i(TAG, "backup provider start");
-        if (backupListener == null) {
-
-            backupListener = new LocationListener() {
-                @Override
-                public void onLocationChanged(Location location) {
-                    Log.i(TAG, "backup provider location");
-                    updateLocation(location);
-                }
-
-                @Override
-                public void onStatusChanged(String s, int i, Bundle bundle) {
-                }
-
-                @Override
-                public void onProviderEnabled(String s) {
-                }
-
-                @Override
-                public void onProviderDisabled(String s) {
-                }
-            };
-
-            locationManager.requestLocationUpdates(
-                    LocationManager.NETWORK_PROVIDER, period, 0, backupListener);
-        }
-    }
-
-    private void stopBackupProvider() {
-        Log.i(TAG, "backup provider stop");
-        if (backupListener != null) {
-            locationManager.removeUpdates(backupListener);
-            backupListener = null;
-        }
-    }
-
-    @Override
-    public void onLocationChanged(Location location) {
-        Log.i(TAG, "provider location");
-        stopBackupProvider();
-        lastFixTime = System.currentTimeMillis();
-        updateLocation(location);
-    }
-
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-    }
-
-    @Override
-    public void onProviderEnabled(String provider) {
-        Log.i(TAG, "provider enabled");
-        stopBackupProvider();
-    }
-
-    @Override
-    public void onProviderDisabled(String provider) {
-        Log.i(TAG, "provider disabled");
-        startBackupProvider();
-    }
-
-    @Override
-    public void onGpsStatusChanged(int event) {
-        if (backupListener == null && System.currentTimeMillis() - (lastFixTime + period) > FIX_TIMEOUT) {
-            startBackupProvider();
-        }
-    }
-
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.util.Log;
-
-public class NetworkManager extends BroadcastReceiver {
-
-    private static final String TAG = NetworkManager.class.getSimpleName();
-
-    private Context context;
-    private NetworkHandler handler;
-    private ConnectivityManager connectivityManager;
-
-    public NetworkManager(Context context, NetworkHandler handler) {
-        this.context = context;
-        this.handler = handler;
-        connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    }
-
-    public interface NetworkHandler {
-        void onNetworkUpdate(boolean isOnline);
-    }
-
-    public boolean isOnline() {
-        NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
-        return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
-    }
-
-    public void start() {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        context.registerReceiver(this, filter);
-    }
-
-    public void stop() {
-        context.unregisterReceiver(this);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION) && handler != null) {
-            boolean isOnline = isOnline();
-            Log.i(TAG, "network " + (isOnline ? "on" : "off"));
-            handler.onNetworkUpdate(isOnline);
-        }
-    }
-
-}

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 - 2021 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.
+ */
+@file:Suppress("DEPRECATION")
+package org.traccar.client
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.util.Log
+
+class NetworkManager(private val context: Context, private val handler: NetworkHandler?) : BroadcastReceiver() {
+
+    private val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    interface NetworkHandler {
+        fun onNetworkUpdate(isOnline: Boolean)
+    }
+
+    val isOnline: Boolean
+        get() {
+            val activeNetwork = connectivityManager.activeNetworkInfo
+            return activeNetwork != null && activeNetwork.isConnectedOrConnecting
+        }
+
+    fun start() {
+        val filter = IntentFilter()
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
+        context.registerReceiver(this, filter)
+    }
+
+    fun stop() {
+        context.unregisterReceiver(this)
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == ConnectivityManager.CONNECTIVITY_ACTION && handler != null) {
+            val isOnline = isOnline
+            Log.i(TAG, "network " + if (isOnline) "on" else "off")
+            handler.onNetworkUpdate(isOnline)
+        }
+    }
+
+    companion object {
+        private val TAG = NetworkManager::class.java.simpleName
+    }
+
+}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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.location.Location;
-
-import java.util.Date;
-
-public class Position {
-
-    public Position() {
-    }
-
-    public Position(String deviceId, Location location, double battery) {
-        this.deviceId = deviceId;
-        time = new Date(location.getTime());
-        latitude = location.getLatitude();
-        longitude = location.getLongitude();
-        altitude = location.getAltitude();
-        speed = location.getSpeed() * 1.943844; // speed in knots
-        course = location.getBearing();
-        this.battery = battery;
-    }
-
-    private long id;
-    public long getId() { return id; }
-    public void setId(long id) { this.id = id; }
-
-    private String deviceId;
-    public String getDeviceId() { return deviceId; }
-    public void setDeviceId(String deviceId) { this.deviceId = deviceId; }
-
-    private Date time;
-    public Date getTime() { return time; }
-    public void setTime(Date time) { this.time = time; }
-
-    private double latitude;
-    public double getLatitude() { return latitude; }
-    public void setLatitude(double latitude) { this.latitude = latitude; }
-
-    private double longitude;
-    public double getLongitude() { return longitude; }
-    public void setLongitude(double longitude) { this.longitude = longitude; }
-
-    private double altitude;
-    public double getAltitude() { return altitude; }
-    public void setAltitude(double altitude) { this.altitude = altitude; }
-
-    private double speed;
-    public double getSpeed() { return speed; }
-    public void setSpeed(double speed) { this.speed = speed; }
-
-    private double course;
-    public double getCourse() { return course; }
-    public void setCourse(double course) { this.course = course; }
-
-    private double battery;
-    public double getBattery() { return battery; }
-    public void setBattery(double battery) { this.battery = battery; }
-
-}

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 - 2022 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.location.Location
+import android.location.LocationManager
+import android.os.Build
+import java.util.*
+
+data class Position(
+    val id: Long = 0,
+    val deviceId: String,
+    val time: Date,
+    val latitude: Double = 0.0,
+    val longitude: Double = 0.0,
+    val altitude: Double = 0.0,
+    val speed: Double = 0.0,
+    val course: Double = 0.0,
+    val accuracy: Double = 0.0,
+    val battery: Double = 0.0,
+    val charging: Boolean = false,
+    val mock: Boolean = false,
+) {
+
+    constructor(deviceId: String, location: Location, battery: BatteryStatus) : this(
+        deviceId = deviceId,
+        time = Date(location.time.correctRollover()),
+        latitude = location.latitude,
+        longitude = location.longitude,
+        altitude = location.altitude,
+        speed = location.speed * 1.943844, // speed in knots
+        course = location.bearing.toDouble(),
+        accuracy = if (location.provider != null && location.provider != LocationManager.GPS_PROVIDER) {
+            location.accuracy.toDouble()
+        } else {
+            0.0
+        },
+        battery = battery.level,
+        charging = battery.charging,
+        mock = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            location.isMock
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            @Suppress("DEPRECATION")
+            location.isFromMockProvider
+        } else {
+            false
+        },
+    )
+}
+
+private const val rolloverDate = 1554508800000L // April 6, 2019
+private const val rolloverOffset = 619315200000L // 1024 weeks
+
+private fun Long.correctRollover(): Long {
+    return if (this < rolloverDate) this + rolloverOffset else this
+}

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

@@ -1,89 +0,0 @@
-/*
- * Copyright 2013 - 2015 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.
- * 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.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.location.Location;
-import android.location.LocationManager;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-public abstract class PositionProvider {
-
-    protected static final String TAG = PositionProvider.class.getSimpleName();
-
-    public interface PositionListener {
-        void onPositionUpdate(Position position);
-    }
-
-    private final PositionListener listener;
-
-    private final Context context;
-    private final SharedPreferences preferences;
-    protected final LocationManager locationManager;
-
-    private String deviceId;
-    protected String type;
-    protected final long period;
-
-    private long lastUpdateTime;
-
-    public PositionProvider(Context context, PositionListener listener) {
-        this.context = context;
-        this.listener = listener;
-
-        preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-
-        deviceId = preferences.getString(MainActivity.KEY_DEVICE, null);
-        period = Integer.parseInt(preferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000;
-
-        type = preferences.getString(MainActivity.KEY_PROVIDER, null);
-    }
-
-    public abstract void startUpdates();
-
-    public abstract void stopUpdates();
-
-    protected void updateLocation(Location location) {
-        if (location != null && location.getTime() != lastUpdateTime) {
-            Log.i(TAG, "location new");
-            lastUpdateTime = location.getTime();
-            listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel()));
-        } else {
-            Log.i(TAG, location != null ? "location old" : "location nil");
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.ECLAIR)
-    private double getBatteryLevel() {
-        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ECLAIR) {
-            Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-            int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-            int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
-            return (level * 100.0) / scale;
-        } else {
-            return 0;
-        }
-    }
-
-}

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013 - 2022 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
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.SharedPreferences
+import android.location.Location
+import android.os.BatteryManager
+import androidx.preference.PreferenceManager
+import android.util.Log
+import kotlin.math.abs
+
+abstract class PositionProvider(
+    protected val context: Context,
+    protected val listener: PositionListener,
+) {
+
+    interface PositionListener {
+        fun onPositionUpdate(position: Position)
+        fun onPositionError(error: Throwable)
+    }
+
+    protected var preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    protected var deviceId = preferences.getString(MainFragment.KEY_DEVICE, "undefined")!!
+    protected var interval = preferences.getString(MainFragment.KEY_INTERVAL, "600")!!.toLong() * 1000
+    protected var distance: Double = preferences.getString(MainFragment.KEY_DISTANCE, "0")!!.toInt().toDouble()
+    protected var angle: Double = preferences.getString(MainFragment.KEY_ANGLE, "0")!!.toInt().toDouble()
+    private var lastLocation: Location? = null
+
+    abstract fun startUpdates()
+    abstract fun stopUpdates()
+    abstract fun requestSingleLocation()
+
+    protected fun processLocation(location: Location?) {
+        val lastLocation = this.lastLocation
+        if (location != null &&
+            (lastLocation == null || location.time - lastLocation!!.time >= interval || distance > 0
+                    && location.distanceTo(lastLocation) >= distance || angle > 0
+                    && abs(location.bearing - lastLocation!!.bearing) >= angle)
+        ) {
+            Log.i(TAG, "location new")
+            this.lastLocation = location
+            listener.onPositionUpdate(Position(deviceId, location, getBatteryStatus(context)))
+        } else {
+            Log.i(TAG, if (location != null) "location ignored" else "location nil")
+        }
+    }
+
+    protected fun getBatteryStatus(context: Context): BatteryStatus {
+        val batteryIntent = context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+        if (batteryIntent != null) {
+            val level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0)
+            val scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1)
+            val status = batteryIntent.getIntExtra(BatteryManager.EXTRA_STATUS, -1)
+            return BatteryStatus(
+                level = level * 100.0 / scale,
+                charging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL,
+            )
+        }
+        return BatteryStatus()
+    }
+
+    companion object {
+        private val TAG = PositionProvider::class.java.simpleName
+        const val MINIMUM_INTERVAL: Long = 1000
+    }
+
+}

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

@@ -1,39 +0,0 @@
-/*
- * Copyright 2012 - 2015 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.
- * 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.location.Location;
-import android.net.Uri;
-
-public class ProtocolFormatter {
-
-    public static String formatRequest(String address, int port, Position position) {
-
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("http").encodedAuthority(address + ':' + port)
-                .appendQueryParameter("id", position.getDeviceId())
-                .appendQueryParameter("timestamp", String.valueOf(position.getTime().getTime() / 1000))
-                .appendQueryParameter("lat", String.valueOf(position.getLatitude()))
-                .appendQueryParameter("lon", String.valueOf(position.getLongitude()))
-                .appendQueryParameter("speed", String.valueOf(position.getSpeed()))
-                .appendQueryParameter("bearing", String.valueOf(position.getCourse()))
-                .appendQueryParameter("altitude", String.valueOf(position.getAltitude()))
-                .appendQueryParameter("batt", String.valueOf(position.getBattery()));
-
-        return builder.build().toString();
-    }
-
-}

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2012 - 2021 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.net.Uri
+
+object ProtocolFormatter {
+
+    fun formatRequest(url: String, position: Position, alarm: String? = null): String {
+        val serverUrl = Uri.parse(url)
+        val builder = serverUrl.buildUpon()
+            .appendQueryParameter("id", position.deviceId)
+            .appendQueryParameter("timestamp", (position.time.time / 1000).toString())
+            .appendQueryParameter("lat", position.latitude.toString())
+            .appendQueryParameter("lon", position.longitude.toString())
+            .appendQueryParameter("speed", position.speed.toString())
+            .appendQueryParameter("bearing", position.course.toString())
+            .appendQueryParameter("altitude", position.altitude.toString())
+            .appendQueryParameter("accuracy", position.accuracy.toString())
+            .appendQueryParameter("batt", position.battery.toString())
+        if (position.charging) {
+            builder.appendQueryParameter("charge", position.charging.toString())
+        }
+        if (position.mock) {
+            builder.appendQueryParameter("mock", position.mock.toString())
+        }
+        if (alarm != null) {
+            builder.appendQueryParameter("alarm", alarm)
+        }
+        return builder.build().toString()
+    }
+}

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

@@ -1,81 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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.os.AsyncTask;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class RequestManager {
-
-    private static final int TIMEOUT = 15 * 1000;
-
-    public interface RequestHandler {
-        void onComplete(boolean success);
-    }
-
-    private static class RequestAsyncTask extends AsyncTask<String, Void, Boolean> {
-
-        private RequestHandler handler;
-
-        public RequestAsyncTask(RequestHandler handler) {
-            this.handler = handler;
-        }
-
-        @Override
-        protected Boolean doInBackground(String... request) {
-            return sendRequest(request[0]);
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            handler.onComplete(result);
-        }
-    }
-
-    public static boolean sendRequest(String request) {
-        InputStream inputStream = null;
-        try {
-            URL url = new URL(request);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setReadTimeout(TIMEOUT);
-            connection.setConnectTimeout(TIMEOUT);
-            connection.connect();
-            inputStream = connection.getInputStream();
-            while (inputStream.read() != -1);
-            return true;
-        } catch (IOException error) {
-            return false;
-        } finally {
-            try {
-                if (inputStream != null) {
-                    inputStream.close();
-                }
-            } catch (IOException secondError) {
-                return false;
-            }
-        }
-    }
-
-    public static void sendRequestAsync(String request, RequestHandler handler) {
-        RequestAsyncTask task = new RequestAsyncTask(handler);
-        task.execute(request);
-    }
-
-}

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 - 2021 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.
+ */
+@file:Suppress("DEPRECATION")
+package org.traccar.client
+
+import android.os.AsyncTask
+import android.util.Log
+import java.io.IOException
+import java.io.InputStream
+import java.net.HttpURLConnection
+import java.net.URL
+
+object RequestManager {
+
+    private const val TIMEOUT = 15 * 1000
+
+    fun sendRequest(request: String?): Boolean {
+        var inputStream: InputStream? = null
+        return try {
+            val url = URL(request)
+            val connection = url.openConnection() as HttpURLConnection
+            connection.readTimeout = TIMEOUT
+            connection.connectTimeout = TIMEOUT
+            connection.requestMethod = "POST"
+            connection.connect()
+            inputStream = connection.inputStream
+            while (inputStream.read() != -1) {}
+            true
+        } catch (error: IOException) {
+            false
+        } finally {
+            try {
+                inputStream?.close()
+            } catch (secondError: IOException) {
+                Log.w(RequestManager::class.java.simpleName, secondError)
+            }
+        }
+    }
+
+    fun sendRequestAsync(request: String, handler: RequestHandler) {
+        RequestAsyncTask(handler).execute(request)
+    }
+
+    interface RequestHandler {
+        fun onComplete(success: Boolean)
+    }
+
+    private class RequestAsyncTask(private val handler: RequestHandler) : AsyncTask<String, Unit, Boolean>() {
+
+        override fun doInBackground(vararg request: String): Boolean {
+            return sendRequest(request[0])
+        }
+
+        override fun onPostExecute(result: Boolean) {
+            handler.onComplete(result)
+        }
+    }
+}

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 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.
- * 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.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.widget.Toast;
-
-public class ShortcutActivity extends Activity {
-
-    public static final String EXTRA_ACTION = "shortcutAction";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        checkShortcutAction(getIntent());
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        checkShortcutAction(intent);
-    }
-
-    private void checkShortcutAction(Intent intent) {
-        if (intent.hasExtra(EXTRA_ACTION)) {
-            boolean start = intent.getBooleanExtra(EXTRA_ACTION, false);
-            PreferenceManager.getDefaultSharedPreferences(this)
-                    .edit().putBoolean(MainActivity.KEY_STATUS, start).commit();
-            if (start) {
-                startService(new Intent(this, TrackingService.class));
-                Toast.makeText(this, R.string.status_service_create, Toast.LENGTH_SHORT).show();
-            } else {
-                stopService(new Intent(this, TrackingService.class));
-                Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
-            }
-            finish();
-        }
-    }
-
-}

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

@@ -0,0 +1,138 @@
+/*
+ * Copyright 2016 - 2021 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.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.widget.AdapterView.OnItemClickListener
+import android.widget.ArrayAdapter
+import android.widget.ListView
+import android.widget.Toast
+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
+import androidx.preference.PreferenceManager
+import org.traccar.client.PositionProvider.PositionListener
+import org.traccar.client.ProtocolFormatter.formatRequest
+import org.traccar.client.RequestManager.RequestHandler
+import org.traccar.client.RequestManager.sendRequestAsync
+
+class ShortcutActivity : AppCompatActivity() {
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (!executeAction(intent)) {
+            setContentView(R.layout.list)
+            val items = arrayOf(
+                getString(R.string.shortcut_start),
+                getString(R.string.shortcut_stop),
+                getString(R.string.shortcut_sos)
+            )
+            val listView = findViewById<ListView>(android.R.id.list)
+            listView.adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, items)
+            listView.onItemClickListener = OnItemClickListener { _, _, position, _ ->
+                when (position) {
+                    0 -> setShortcutResult(items[position], R.mipmap.ic_start, ACTION_START)
+                    1 -> setShortcutResult(items[position], R.mipmap.ic_stop, ACTION_STOP)
+                    2 -> setShortcutResult(items[position], R.mipmap.ic_sos, ACTION_SOS)
+                }
+                finish()
+            }
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        executeAction(intent)
+    }
+
+    private fun setShortcutResult(label: String, @DrawableRes iconResId: Int, action: String) {
+        val intent = Intent(Intent.ACTION_DEFAULT, null, this, ShortcutActivity::class.java)
+        intent.putExtra(EXTRA_ACTION, action)
+        val shortcut = ShortcutInfoCompat.Builder(this, action)
+            .setShortLabel(label)
+            .setIcon(IconCompat.createWithResource(this, iconResId))
+            .setIntent(intent)
+            .build()
+        setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(this, shortcut))
+    }
+
+    private fun sendAlarm() {
+        PositionProviderFactory.create(this, object : PositionListener {
+            override fun onPositionUpdate(position: Position) {
+                val preferences = PreferenceManager.getDefaultSharedPreferences(this@ShortcutActivity)
+                val request = formatRequest(preferences.getString(MainFragment.KEY_URL, null)!!, position, ALARM_SOS)
+                sendRequestAsync(request, object : RequestHandler {
+                    override fun onComplete(success: Boolean) {
+                        if (success) {
+                            Toast.makeText(this@ShortcutActivity, R.string.status_send_success, Toast.LENGTH_SHORT).show()
+                        } else {
+                            Toast.makeText(this@ShortcutActivity, R.string.status_send_fail, Toast.LENGTH_SHORT).show()
+                        }
+                    }
+                })
+            }
+
+            override fun onPositionError(error: Throwable) {
+                Toast.makeText(this@ShortcutActivity, error.message, Toast.LENGTH_LONG).show()
+            }
+        }).requestSingleLocation()
+    }
+
+    private fun executeAction(intent: Intent): Boolean {
+        val action: String? = if (intent.hasExtra("shortcutAction")) {
+            if (intent.getBooleanExtra("shortcutAction", false)) ACTION_START else ACTION_STOP
+        } else {
+            intent.getStringExtra(EXTRA_ACTION)
+        }
+        if (action != null) {
+            when (action) {
+                ACTION_START -> {
+                    PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(MainFragment.KEY_STATUS, true).apply()
+                    ContextCompat.startForegroundService(this, Intent(this, TrackingService::class.java))
+                    Toast.makeText(this, R.string.status_service_create, Toast.LENGTH_SHORT).show()
+                }
+                ACTION_STOP -> {
+                    PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(MainFragment.KEY_STATUS, false).apply()
+                    stopService(Intent(this, TrackingService::class.java))
+                    Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show()
+                }
+                ACTION_SOS -> {
+                    if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+                        sendAlarm()
+                    } else {
+                        Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+            finish()
+        }
+        return action != null
+    }
+
+    companion object {
+        const val EXTRA_ACTION = "action"
+        const val ACTION_START = "start"
+        const val ACTION_STOP = "stop"
+        const val ACTION_SOS = "sos"
+        private const val ALARM_SOS = "sos"
+    }
+}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-
-public class SimplePositionProvider extends PositionProvider implements LocationListener {
-
-    public SimplePositionProvider(Context context, PositionListener listener) {
-        super(context, listener);
-        if (!type.equals(LocationManager.NETWORK_PROVIDER)) {
-            type = LocationManager.GPS_PROVIDER;
-        }
-    }
-
-    public void startUpdates() {
-        locationManager.requestLocationUpdates(type, period, 0, this);
-    }
-
-    public void stopUpdates() {
-        locationManager.removeUpdates(this);
-    }
-
-    @Override
-    public void onLocationChanged(Location location) {
-        updateLocation(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/StatusActivity.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2012 - 2013 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.
- * 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 java.text.DateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ArrayAdapter;
-
-public class StatusActivity extends ListActivity {
-
-    private static final int LIMIT = 20;
-
-    private static final LinkedList<String> messages = new LinkedList<String>();
-    private static final Set<ArrayAdapter<String>> adapters = new HashSet<ArrayAdapter<String>>();
-
-    private static void notifyAdapters() {
-        for (ArrayAdapter<String> adapter : adapters) {
-            adapter.notifyDataSetChanged();
-        }
-    }
-
-    public static void addMessage(String message) {
-        DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT);
-        message = format.format(new Date()) + " - " + message;
-        messages.add(message);
-        while (messages.size() > LIMIT) {
-            messages.removeFirst();
-        }
-        notifyAdapters();
-    }
-
-    public static void clearMessages() {
-        messages.clear();
-        notifyAdapters();
-    }
-
-    private ArrayAdapter<String> adapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.status);
-        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, android.R.id.text1, messages);
-        setListAdapter(adapter);
-        adapters.add(adapter);
-    }
-
-    @Override
-    protected void onDestroy() {
-        adapters.remove(adapter);
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.status, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.clear) {
-            clearMessages();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-}

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012 - 2021 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 androidx.appcompat.app.AppCompatActivity
+import android.widget.ArrayAdapter
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.ListView
+import java.text.DateFormat
+import java.util.*
+
+class StatusActivity : AppCompatActivity() {
+
+    private var adapter: ArrayAdapter<String>? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.list)
+        adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, android.R.id.text1, messages)
+        val listView = findViewById<ListView>(android.R.id.list)
+        listView.adapter = adapter
+        adapter?.let { adapters.add(it) }
+    }
+
+    override fun onDestroy() {
+        adapters.remove(adapter)
+        super.onDestroy()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.status, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.clear) {
+            clearMessages()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+        private const val LIMIT = 20
+        private val messages = LinkedList<String>()
+        private val adapters: MutableSet<ArrayAdapter<String>> = HashSet()
+
+        private fun notifyAdapters() {
+            for (adapter in adapters) {
+                adapter.notifyDataSetChanged()
+            }
+        }
+
+        fun addMessage(originalMessage: String) {
+            var message = originalMessage
+            val format = DateFormat.getTimeInstance(DateFormat.MEDIUM)
+            message = format.format(Date()) + " - " + message
+            messages.add(message)
+            while (messages.size > LIMIT) {
+                messages.removeFirst()
+            }
+            notifyAdapters()
+        }
+
+        fun clearMessages() {
+            messages.clear()
+            notifyAdapters()
+        }
+    }
+}

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

@@ -1,227 +0,0 @@
-/*
- * Copyright 2015 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.
- * 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;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-public class TrackingController implements PositionProvider.PositionListener, NetworkManager.NetworkHandler {
-
-    private static final String TAG = TrackingController.class.getSimpleName();
-    private static final int RETRY_DELAY = 30 * 1000;
-    private static final int WAKE_LOCK_TIMEOUT = 60 * 1000;
-
-    private boolean isOnline;
-    private boolean isWaiting;
-
-    private Context context;
-    private Handler handler;
-    private SharedPreferences preferences;
-
-    private String address;
-    private int port;
-
-    private PositionProvider positionProvider;
-    private DatabaseHelper databaseHelper;
-    private NetworkManager networkManager;
-
-    private PowerManager.WakeLock wakeLock;
-
-    private void lock() {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
-            wakeLock.acquire();
-        } else {
-            wakeLock.acquire(WAKE_LOCK_TIMEOUT);
-        }
-    }
-
-    private void unlock() {
-        if (wakeLock.isHeld()) {
-            wakeLock.release();
-        }
-    }
-
-    public TrackingController(Context context) {
-        this.context = context;
-        handler = new Handler();
-        preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        if (preferences.getString(MainActivity.KEY_PROVIDER, null).equals("mixed")) {
-            positionProvider = new MixedPositionProvider(context, this);
-        } else {
-            positionProvider = new SimplePositionProvider(context, this);
-        }
-        databaseHelper = new DatabaseHelper(context);
-        networkManager = new NetworkManager(context, this);
-        isOnline = networkManager.isOnline();
-
-        address = preferences.getString(MainActivity.KEY_ADDRESS, null);
-        port = Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null));
-
-        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
-    }
-
-    public void start() {
-        if (isOnline) {
-            read();
-        }
-        try {
-            positionProvider.startUpdates();
-        } catch (SecurityException e) {
-            Log.w(TAG, e);
-        }
-        networkManager.start();
-    }
-
-    public void stop() {
-        networkManager.stop();
-        try {
-            positionProvider.stopUpdates();
-        } catch (SecurityException e) {
-            Log.w(TAG, e);
-        }
-        handler.removeCallbacksAndMessages(null);
-    }
-
-    @Override
-    public void onPositionUpdate(Position position) {
-        StatusActivity.addMessage(context.getString(R.string.status_location_update));
-        if (position != null) {
-            write(position);
-        }
-    }
-
-    @Override
-    public void onNetworkUpdate(boolean isOnline) {
-        StatusActivity.addMessage(context.getString(R.string.status_connectivity_change));
-        if (!this.isOnline && isOnline) {
-            read();
-        }
-        this.isOnline = isOnline;
-    }
-
-    //
-    // State transition examples:
-    //
-    // write -> read -> send -> delete -> read
-    //
-    // read -> send -> retry -> read -> send
-    //
-
-    private void log(String action, Position position) {
-        if (position != null) {
-            action += " (" +
-                    "id:" + position.getId() +
-                    " time:" + position.getTime().getTime() / 1000 +
-                    " lat:" + position.getLatitude() +
-                    " lon:" + position.getLongitude() + ")";
-        }
-        Log.d(TAG, action);
-    }
-
-    private void write(Position position) {
-        log("write", position);
-        lock();
-        databaseHelper.insertPositionAsync(position, new DatabaseHelper.DatabaseHandler<Void>() {
-            @Override
-            public void onComplete(boolean success, Void result) {
-                if (success) {
-                    if (isOnline && isWaiting) {
-                        read();
-                        isWaiting = false;
-                    }
-                }
-                unlock();
-            }
-        });
-    }
-
-    private void read() {
-        log("read", null);
-        lock();
-        databaseHelper.selectPositionAsync(new DatabaseHelper.DatabaseHandler<Position>() {
-            @Override
-            public void onComplete(boolean success, Position result) {
-                if (success) {
-                    if (result != null) {
-                        if (result.getDeviceId().equals(preferences.getString(MainActivity.KEY_DEVICE, null))) {
-                            send(result);
-                        } else {
-                            delete(result);
-                        }
-                    } else {
-                        isWaiting = true;
-                    }
-                } 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) {
-                if (success) {
-                    read();
-                } else {
-                    retry();
-                }
-                unlock();
-            }
-        });
-    }
-
-    private void send(final Position position) {
-        log("send", position);
-        lock();
-        String request = ProtocolFormatter.formatRequest(address, port, position);
-        RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
-            @Override
-            public void onComplete(boolean success) {
-                if (success) {
-                    delete(position);
-                } else {
-                    StatusActivity.addMessage(context.getString(R.string.status_send_fail));
-                    retry();
-                }
-                unlock();
-            }
-        });
-    }
-
-    private void retry() {
-        log("retry", null);
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (isOnline) {
-                    read();
-                }
-            }
-        }, RETRY_DELAY);
-    }
-
-}

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

@@ -0,0 +1,186 @@
+/*
+ * Copyright 2015 - 2021 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
+import org.traccar.client.ProtocolFormatter.formatRequest
+import org.traccar.client.RequestManager.sendRequestAsync
+import org.traccar.client.PositionProvider.PositionListener
+import org.traccar.client.NetworkManager.NetworkHandler
+import android.os.Handler
+import android.os.Looper
+import androidx.preference.PreferenceManager
+import android.util.Log
+import org.traccar.client.DatabaseHelper.DatabaseHandler
+import org.traccar.client.RequestManager.RequestHandler
+
+class TrackingController(private val context: Context) : PositionListener, NetworkHandler {
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+    private val positionProvider = PositionProviderFactory.create(context, this)
+    private val databaseHelper = DatabaseHelper(context)
+    private val networkManager = NetworkManager(context, this)
+
+    private val url: String = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value))!!
+    private val buffer: Boolean = preferences.getBoolean(MainFragment.KEY_BUFFER, true)
+
+    private var isOnline = networkManager.isOnline
+    private var isWaiting = false
+
+    fun start() {
+        if (isOnline) {
+            read()
+        }
+        try {
+            positionProvider.startUpdates()
+        } catch (e: SecurityException) {
+            Log.w(TAG, e)
+        }
+        networkManager.start()
+    }
+
+    fun stop() {
+        networkManager.stop()
+        try {
+            positionProvider.stopUpdates()
+        } catch (e: SecurityException) {
+            Log.w(TAG, e)
+        }
+        handler.removeCallbacksAndMessages(null)
+    }
+
+    override fun onPositionUpdate(position: Position) {
+        StatusActivity.addMessage(context.getString(R.string.status_location_update))
+        if (buffer) {
+            write(position)
+        } else {
+            send(position)
+        }
+    }
+
+    override fun onPositionError(error: Throwable) {}
+    override fun onNetworkUpdate(isOnline: Boolean) {
+        val message = if (isOnline) R.string.status_network_online else R.string.status_network_offline
+        StatusActivity.addMessage(context.getString(message))
+        if (!this.isOnline && isOnline) {
+            read()
+        }
+        this.isOnline = isOnline
+    }
+
+    //
+    // State transition examples:
+    //
+    // write -> read -> send -> delete -> read
+    //
+    // read -> send -> retry -> read -> send
+    //
+
+    private fun log(action: String, position: Position?) {
+        var formattedAction: String = action
+        if (position != null) {
+            formattedAction +=
+                    " (id:" + position.id +
+                    " time:" + position.time.time / 1000 +
+                    " lat:" + position.latitude +
+                    " lon:" + position.longitude + ")"
+        }
+        Log.d(TAG, formattedAction)
+    }
+
+    private fun write(position: Position) {
+        log("write", position)
+        databaseHelper.insertPositionAsync(position, object : DatabaseHandler<Unit?> {
+            override fun onComplete(success: Boolean, result: Unit?) {
+                if (success) {
+                    if (isOnline && isWaiting) {
+                        read()
+                        isWaiting = false
+                    }
+                }
+            }
+        })
+    }
+
+    private fun read() {
+        log("read", null)
+        databaseHelper.selectPositionAsync(object : DatabaseHandler<Position?> {
+            override fun onComplete(success: Boolean, result: Position?) {
+                if (success) {
+                    if (result != null) {
+                        if (result.deviceId == preferences.getString(MainFragment.KEY_DEVICE, null)) {
+                            send(result)
+                        } else {
+                            delete(result)
+                        }
+                    } else {
+                        isWaiting = true
+                    }
+                } else {
+                    retry()
+                }
+            }
+        })
+    }
+
+    private fun delete(position: Position) {
+        log("delete", position)
+        databaseHelper.deletePositionAsync(position.id, object : DatabaseHandler<Unit?> {
+            override fun onComplete(success: Boolean, result: Unit?) {
+                if (success) {
+                    read()
+                } else {
+                    retry()
+                }
+            }
+        })
+    }
+
+    private fun send(position: Position) {
+        log("send", position)
+        val request = formatRequest(url, position)
+        sendRequestAsync(request, object : RequestHandler {
+            override fun onComplete(success: Boolean) {
+                if (success) {
+                    if (buffer) {
+                        delete(position)
+                    }
+                } else {
+                    StatusActivity.addMessage(context.getString(R.string.status_send_fail))
+                    if (buffer) {
+                        retry()
+                    }
+                }
+            }
+        })
+    }
+
+    private fun retry() {
+        log("retry", null)
+        handler.postDelayed({
+            if (isOnline) {
+                read()
+            }
+        }, RETRY_DELAY.toLong())
+    }
+
+    companion object {
+        private val TAG = TrackingController::class.java.simpleName
+        private const val RETRY_DELAY = 30 * 1000
+    }
+
+}

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

@@ -1,131 +0,0 @@
-/*
- * Copyright 2012 - 2015 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.
- * 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.TargetApi;
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class TrackingService extends Service {
-
-    private static final String TAG = TrackingService.class.getSimpleName();
-    private static final int NOTIFICATION_ID = 1;
-
-    private TrackingController trackingController;
-
-    @SuppressWarnings("deprecation")
-    private static Notification createNotification(Context context) {
-        Intent notificationIntent = new Intent(context, MainActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
-
-        Notification notification = new Notification(android.R.drawable.stat_notify_sync_noanim, null, 0);
-        try {
-            Method method = notification.getClass().getMethod("setLatestEventInfo", Context.class, CharSequence.class, CharSequence.class, PendingIntent.class);
-            try {
-                method.invoke(notification, context, context.getString(R.string.app_name), context.getString(R.string.settings_status_on_summary), pendingIntent);
-            } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
-                Log.w(TAG, e);
-            }
-        } catch (SecurityException | NoSuchMethodException e) {
-            Log.w(TAG, e);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            notification.priority = Notification.PRIORITY_MIN;
-        }
-
-        return notification;
-    }
-
-    @TargetApi(Build.VERSION_CODES.ECLAIR)
-    public static class HideNotificationService extends Service {
-        @Override
-        public IBinder onBind(Intent intent) {
-            return null;
-        }
-
-        @Override
-        public void onCreate() {
-            startForeground(NOTIFICATION_ID, createNotification(this));
-            stopForeground(true);
-        }
-
-        @Override
-        public int onStartCommand(Intent intent, int flags, int startId) {
-            stopSelfResult(startId);
-            return START_NOT_STICKY;
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        Log.i(TAG, "service create");
-        StatusActivity.addMessage(getString(R.string.status_service_create));
-
-        trackingController = new TrackingController(this);
-        trackingController.start();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
-            startForeground(NOTIFICATION_ID, createNotification(this));
-            startService(new Intent(this, HideNotificationService.class));
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onStart(Intent intent, int startId) {
-        if (intent != null) {
-            AutostartReceiver.completeWakefulIntent(intent);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.ECLAIR)
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        onStart(intent, startId);
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        Log.i(TAG, "service destroy");
-        StatusActivity.addMessage(getString(R.string.status_service_destroy));
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
-            stopForeground(true);
-        }
-
-        if (trackingController != null) {
-            trackingController.stop();
-        }
-    }
-
-}

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

@@ -0,0 +1,133 @@
+/*
+ * Copyright 2012 - 2021 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.Manifest
+import android.annotation.SuppressLint
+import android.annotation.TargetApi
+import android.app.Notification
+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.os.PowerManager
+import android.os.PowerManager.WakeLock
+import android.provider.Settings
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
+
+class TrackingService : Service() {
+
+    private var wakeLock: WakeLock? = null
+    private var trackingController: TrackingController? = null
+
+    class HideNotificationService : Service() {
+        override fun onBind(intent: Intent): IBinder? {
+            return null
+        }
+
+        override fun onCreate() {
+            startForeground(NOTIFICATION_ID, createNotification(this))
+            stopForeground(true)
+        }
+
+        override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+            stopSelfResult(startId)
+            return START_NOT_STICKY
+        }
+    }
+
+    @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))
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(MainFragment.KEY_WAKELOCK, true)) {
+                val powerManager = getSystemService(POWER_SERVICE) as PowerManager
+                wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, javaClass.name)
+                wakeLock?.acquire()
+            }
+            trackingController = TrackingController(this)
+            trackingController?.start()
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            ContextCompat.startForegroundService(this, Intent(this, HideNotificationService::class.java))
+        }
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    @TargetApi(Build.VERSION_CODES.ECLAIR)
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        WakefulBroadcastReceiver.completeWakefulIntent(intent)
+        return START_STICKY
+    }
+
+    override fun onDestroy() {
+        stopForeground(true)
+        Log.i(TAG, "service destroy")
+        sendBroadcast(Intent(ACTION_STOPPED))
+        StatusActivity.addMessage(getString(R.string.status_service_destroy))
+        if (wakeLock?.isHeld == true) {
+            wakeLock?.release()
+        }
+        trackingController?.stop()
+    }
+
+    companion object {
+
+        const val ACTION_STARTED = "org.traccar.action.SERVICE_STARTED"
+        const val ACTION_STOPPED = "org.traccar.action.SERVICE_STOPPED"
+        private val TAG = TrackingService::class.java.simpleName
+        private const val NOTIFICATION_ID = 1
+
+        @SuppressLint("UnspecifiedImmutableFlag")
+        private fun createNotification(context: Context): Notification {
+            val builder = NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL)
+                .setSmallIcon(R.drawable.ic_stat_notify)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setCategory(NotificationCompat.CATEGORY_SERVICE)
+            val intent: Intent
+            if (!BuildConfig.HIDDEN_APP) {
+                intent = Intent(context, MainActivity::class.java)
+                builder
+                    .setContentTitle(context.getString(R.string.settings_status_on_summary))
+                    .setTicker(context.getString(R.string.settings_status_on_summary))
+                    .color = ContextCompat.getColor(context, R.color.primary_dark)
+            } else {
+                intent = Intent(Settings.ACTION_SETTINGS)
+            }
+            val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                PendingIntent.FLAG_IMMUTABLE
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            }
+            builder.setContentIntent(PendingIntent.getActivity(context, 0, intent, flags))
+            return builder.build()
+        }
+    }
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2021 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.BroadcastReceiver
+import android.content.Context
+import android.util.SparseArray
+import android.os.PowerManager.WakeLock
+import android.content.Intent
+import androidx.core.content.ContextCompat
+import android.os.PowerManager
+
+abstract class WakefulBroadcastReceiver : BroadcastReceiver() {
+
+    companion object {
+
+        private const val EXTRA_WAKE_LOCK_ID = "android.support.content.wakelockid"
+        private val activeWakeLocks = SparseArray<WakeLock>()
+        private var nextId = 1
+
+        fun startWakefulForegroundService(context: Context, intent: Intent) {
+            synchronized(activeWakeLocks) {
+                val id = nextId
+                nextId += 1
+                if (nextId <= 0) {
+                    nextId = 1
+                }
+                intent.putExtra(EXTRA_WAKE_LOCK_ID, id)
+                ContextCompat.startForegroundService(context, intent)
+                val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+                val wakeLock = powerManager.newWakeLock(
+                    PowerManager.PARTIAL_WAKE_LOCK,
+                    WakefulBroadcastReceiver::class.java.simpleName
+                )
+                wakeLock.setReferenceCounted(false)
+                wakeLock.acquire((60 * 1000).toLong())
+                activeWakeLocks.put(id, wakeLock)
+            }
+        }
+
+        fun completeWakefulIntent(intent: Intent?): Boolean {
+            val id = intent?.getIntExtra(EXTRA_WAKE_LOCK_ID, 0) ?: 0
+            if (id == 0) {
+                return false
+            }
+            synchronized(activeWakeLocks) {
+                val wakeLock = activeWakeLocks[id]
+                if (wakeLock != null) {
+                    wakeLock.release()
+                    activeWakeLocks.remove(id)
+                    return true
+                }
+                return true
+            }
+        }
+    }
+}

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <group android:scaleX="0.71"
+      android:scaleY="0.71"
+      android:translateX="9.28"
+      android:translateY="9.28">
+    <path
+        android:pathData="m32.459,10.617c-3.783,-0.085 -7.636,0.834 -11.152,2.865 -10.228,5.906 -13.731,18.983 -7.826,29.211 5.906,10.228 18.983,13.731 29.211,7.826 10.228,-5.906 13.733,-18.983 7.828,-29.211 -3.875,-6.712 -10.839,-10.529 -18.061,-10.691zM40.778,19.38c1.737,1.331 3.242,2.997 4.404,5.01 1.162,2.013 1.854,4.15 2.137,6.319l-3.804,0.547c-0.223,-1.679 -0.73,-3.405 -1.629,-4.964 -0.9,-1.559 -2.139,-2.86 -3.482,-3.892zM36.188,25.461c0.948,0.734 1.766,1.632 2.402,2.734 0.636,1.102 1.003,2.258 1.165,3.446l-3.803,0.549c-0.101,-0.699 -0.284,-1.445 -0.658,-2.093 -0.374,-0.648 -0.928,-1.179 -1.483,-1.615l2.377,-3.019zM21.601,29.215 L25.407,35.806 29.213,42.398a7.611,7.611 0,0 1,-7.612 0,7.611 7.611,0 0,1 -3.806,-6.592 7.611,7.611 0,0 1,3.806 -6.591zM30.306,31.049a1.903,1.903 0,0 1,1.693 0.951,1.903 1.903,0 0,1 -0.697,2.599 1.903,1.903 0,0 1,-2.599 -0.695,1.903 1.903,0 0,1 0.697,-2.601 1.903,1.903 0,0 1,0.906 -0.254z"
+        android:strokeWidth=".84379"
+        android:fillColor="#2e7d32"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_sos_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#2E7D32">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="5.04"
+      android:translateY="5.04">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_start_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#2E7D32">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="5.04"
+      android:translateY="5.04">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM9.5,16.5v-9l7,4.5L9.5,16.5z"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_stat_notify.xml

@@ -0,0 +1,10 @@
+<vector
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="72.0"
+    android:viewportWidth="72.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M36,0A36,36 0,0 0,0 36A36,36 0,0 0,36 72A36,36 0,0 0,72 36A36,36 0,0 0,36 0zM50.51,14.66C53.41,16.89 55.93,19.68 57.88,23.05C59.83,26.42 60.99,30 61.46,33.63L55.09,34.55C54.72,31.74 53.87,28.85 52.36,26.24C50.85,23.63 48.78,21.45 46.53,19.72L50.51,14.66zM42.82,24.85C44.4,26.08 45.77,27.58 46.84,29.43C47.91,31.27 48.52,33.21 48.79,35.2L42.42,36.12C42.25,34.95 41.95,33.7 41.32,32.61C40.69,31.53 39.77,30.64 38.84,29.91L42.82,24.85zM18.38,31.13L24.76,42.17L31.13,53.21A12.75,12.75 37.68,0 1,18.38 53.21A12.75,12.75 37.68,0 1,12.01 42.17A12.75,12.75 37.68,0 1,18.38 31.13zM32.96,34.21A3.19,3.19 60,0 1,35.8 35.8A3.19,3.19 60,0 1,34.63 40.15A3.19,3.19 60,0 1,30.28 38.99A3.19,3.19 60,0 1,31.45 34.63A3.19,3.19 60,0 1,32.96 34.21z"/>
+</vector>

app/src/main/res/drawable/ic_stop_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#2E7D32">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="5.04"
+      android:translateY="5.04">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM11,16H9V8h2V16zM15,16h-2V8h2V16z"/>
+  </group>
+</vector>

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

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ImageView
-        android:id="@+id/logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/about_margin"
-        android:layout_marginStart="@dimen/about_margin"
-        android:layout_marginTop="@dimen/about_margin"
-        android:src="@drawable/logo"
-        android:contentDescription="@string/app_logo" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_margin="@dimen/about_margin"
-        android:layout_toRightOf="@+id/logo"
-        android:layout_toEndOf="@+id/logo"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/about_spacing"
-            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/about_spacing"
-            android:text="@string/about_description" />
-        
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/about_spacing"
-            android:text="@string/about_license" />
-        
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/about_spacing"
-            android:text="@string/about_web"
-            android:autoLink="web" />
-        
-    </LinearLayout>
-
-</RelativeLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="org.traccar.client.MainFragment" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" />

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

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/status"
         android:title="@string/menu_status"
-        android:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/shortcuts"
+        android:id="@+id/info"
-        android:title="@string/menu_shortcuts"
+        android:title="@string/menu_info"
-        android:showAsAction="never" />
+        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/about"
-        android:title="@string/menu_about"
-        android:showAsAction="never" />
 
 </menu>

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

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/clear"
         android:title="@string/menu_clear"
-        android:showAsAction="always" />
+        app:showAsAction="always" />
 
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_sos.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_sos_foreground"/>
+    <monochrome android:drawable="@drawable/ic_sos_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_start.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_start_foreground"/>
+    <monochrome android:drawable="@drawable/ic_start_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_stop.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_stop_foreground"/>
+    <monochrome android:drawable="@drawable/ic_stop_foreground"/>
+</adaptive-icon>