Update app version

Gracefully handle package downgrade (fix #350)

app/build.gradle

@@ -1,22 +1,22 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "org.traccar.client"
         buildConfigField "boolean", "HIDDEN_APP", "false"
-        minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 41
-        versionName '5.4'
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 60
+        versionName '5.23'
     }
 
     lintOptions {
         checkReleaseBuilds false
     }
 
+    flavorDimensions "default"
     productFlavors {
         regular
         google
@@ -26,24 +26,26 @@ android {
         }
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
         }
     }
 }
 
 dependencies {
-    compile 'com.android.support:design:26.0.1'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.4.2'
-    googleCompile 'com.google.firebase:firebase-core:11.2.0'
-    googleCompile 'com.google.firebase:firebase-crash:11.2.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'androidx.preference:preference:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.1'
+    googleImplementation 'com.google.firebase:firebase-core:17.2.0'
+    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    googleImplementation "com.google.android.gms:play-services-location:17.0.0"
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {
     apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'io.fabric'
 
     task copyJson(type: Copy) {
         from '../../traccar-shared/google-services'

app/src/google/AndroidManifest.xml

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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 com.google.android.gms.location.FusedLocationProviderClient;
+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;
+import com.google.android.gms.tasks.OnSuccessListener;
+
+public class GooglePositionProvider extends PositionProvider {
+
+    private FusedLocationProviderClient fusedLocationClient;
+
+    public GooglePositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+        fusedLocationClient = LocationServices.getFusedLocationProviderClient(context);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void startUpdates() {
+        LocationRequest locationRequest = new LocationRequest();
+        locationRequest.setPriority(getPriority(preferences.getString(MainFragment.KEY_ACCURACY, "medium")));
+        locationRequest.setInterval(distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval);
+        fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, null);
+    }
+
+    public void stopUpdates() {
+        fusedLocationClient.removeLocationUpdates(locationCallback);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void requestSingleLocation() {
+        fusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() {
+            @Override
+            public void onSuccess(Location location) {
+                if (location != null) {
+                    listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+                }
+            }
+        });
+    }
+
+    private static int getPriority(String accuracy) {
+        switch (accuracy) {
+            case "high":
+                return LocationRequest.PRIORITY_HIGH_ACCURACY;
+            case "low":
+                return LocationRequest.PRIORITY_LOW_POWER;
+            default:
+                return LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
+        }
+    }
+
+    private LocationCallback locationCallback = new LocationCallback() {
+        @Override
+        public void onLocationResult(LocationResult locationResult) {
+            if (locationResult != null) {
+                for (Location location : locationResult.getLocations()) {
+                    processLocation(location);
+                }
+            }
+        }
+    };
+
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new GooglePositionProvider(context, listener);
+    }
+
+}

app/src/hidden/AndroidManifest.xml

@@ -8,6 +8,16 @@
         android:label="@string/hidden_app_name"
         tools:replace="android:label">
 
+        <activity
+            android:name="org.traccar.client.MainActivity">
+            <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" >
             <intent-filter>
                 <action android:name="android.intent.action.NEW_OUTGOING_CALL" />

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new AndroidPositionProvider(context, listener);
+    }
+
+}

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/main/AndroidManifest.xml

@@ -1,22 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.traccar.client">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <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-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/AppTheme"
-        android:name=".MainApplication">
+        android:name=".MainApplication"
+        tools:ignore="GoogleAppIndexingWarning">
+
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
 
         <activity
             android:name=".MainActivity"
@@ -36,8 +48,6 @@
 
         <activity android:name=".StatusActivity"/>
 
-        <activity android:name=".AboutActivity"/>
-
         <activity
             android:name=".ShortcutActivity"
             android:label="@string/menu_shortcuts">
@@ -47,9 +57,12 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".TrackingService" />
+        <service
+            android:name=".TrackingService"
+            android:foregroundServiceType="location" />
 
-        <service android:name=".TrackingService$HideNotificationService" />
+        <service
+            android:name=".TrackingService$HideNotificationService" />
 
         <receiver android:name=".AutostartReceiver">
             <intent-filter>

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

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

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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;
+
+public class AndroidPositionProvider extends PositionProvider implements LocationListener {
+
+    private LocationManager locationManager;
+    private String provider;
+
+    public AndroidPositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        provider = getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium"));
+    }
+
+    @SuppressLint("MissingPermission")
+    public void startUpdates() {
+        try {
+            locationManager.requestLocationUpdates(
+                    provider, distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0, this);
+        } catch (RuntimeException e) {
+            listener.onPositionError(e);
+        }
+    }
+
+    public void stopUpdates() {
+        locationManager.removeUpdates(this);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void requestSingleLocation() {
+        try {
+            Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
+            if (location != null) {
+                listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+            } else {
+                locationManager.requestSingleUpdate(provider, new LocationListener() {
+                    @Override
+                    public void onLocationChanged(Location location) {
+                        listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
+                    }
+
+                    @Override
+                    public void onStatusChanged(String provider, int status, Bundle extras) {
+                    }
+
+                    @Override
+                    public void onProviderEnabled(String provider) {
+                    }
+
+                    @Override
+                    public void onProviderDisabled(String provider) {
+                    }
+                }, Looper.myLooper());
+            }
+        } catch (RuntimeException e) {
+            listener.onPositionError(e);
+        }
+    }
+
+    private static String getProvider(String accuracy) {
+        switch (accuracy) {
+            case "high":
+                return LocationManager.GPS_PROVIDER;
+            case "low":
+                return LocationManager.PASSIVE_PROVIDER;
+            default:
+                return LocationManager.NETWORK_PROVIDER;
+        }
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        processLocation(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/AutostartReceiver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ public class AutostartReceiver extends WakefulBroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         if (sharedPreferences.getBoolean(MainFragment.KEY_STATUS, false)) {
-            startWakefulService(context, new Intent(context, TrackingService.class));
+            startWakefulForegroundService(context, new Intent(context, TrackingService.class));
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import java.util.Date;
 
 public class DatabaseHelper extends SQLiteOpenHelper {
 
-    public static final int DATABASE_VERSION = 2;
+    public static final int DATABASE_VERSION = 3;
     public static final String DATABASE_NAME = "traccar.db";
 
     public interface DatabaseHandler<T> {
@@ -80,7 +80,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                 "speed REAL," +
                 "course REAL," +
                 "accuracy REAL," +
-                "battery REAL)");
+                "battery REAL," +
+                "mock INTEGER)");
     }
 
     @Override
@@ -89,6 +90,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         onCreate(db);
     }
 
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS position;");
+        onCreate(db);
+    }
+
     public void insertPosition(Position position) {
         ContentValues values = new ContentValues();
         values.put("deviceId", position.getDeviceId());
@@ -98,8 +104,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
         values.put("altitude", position.getAltitude());
         values.put("speed", position.getSpeed());
         values.put("course", position.getCourse());
-        values.put("accuracy", position.getCourse());
+        values.put("accuracy", position.getAccuracy());
         values.put("battery", position.getBattery());
+        values.put("mock", position.getMock() ? 1 : 0);
 
         db.insertOrThrow("position", null, values);
     }
@@ -133,6 +140,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                 position.setCourse(cursor.getDouble(cursor.getColumnIndex("course")));
                 position.setAccuracy(cursor.getDouble(cursor.getColumnIndex("accuracy")));
                 position.setBattery(cursor.getDouble(cursor.getColumnIndex("battery")));
+                position.setMock(cursor.getInt(cursor.getColumnIndex("mock")) > 0);
 
             } else {
                 return null;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 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.

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

@@ -1,33 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.client;
-
-public final class DistanceCalculator {
-
-    private static final double EQUATORIAL_EARTH_RADIUS = 6378.1370;
-    private static final double DEG_TO_RAD = Math.PI / 180;
-
-    public static double distance(double lat1, double lon1, double lat2, double lon2) {
-        double dlong = (lon2 - lon1) * DEG_TO_RAD;
-        double dlat = (lat2 - lat1) * DEG_TO_RAD;
-        double a = Math.pow(Math.sin(dlat / 2), 2)
-                + Math.cos(lat1 * DEG_TO_RAD) * Math.cos(lat2 * DEG_TO_RAD) * Math.pow(Math.sin(dlong / 2), 2);
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-        double d = EQUATORIAL_EARTH_RADIUS * c;
-        return d * 1000;
-    }
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.traccar.client;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -25,7 +25,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState == null) {
-            getFragmentManager().beginTransaction().replace(android.R.id.content, new MainFragment()).commit();
+            getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new MainFragment()).commit();
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.traccar.client;
 
 import android.Manifest;
 import android.app.AlarmManager;
-import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
@@ -28,14 +27,15 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.TwoStatePreference;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.TwoStatePreference;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -47,7 +47,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-public class MainFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener {
+public class MainFragment extends PreferenceFragmentCompat implements OnSharedPreferenceChangeListener {
 
     private static final String TAG = MainFragment.class.getSimpleName();
 
@@ -58,7 +58,7 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
     public static final String KEY_INTERVAL = "interval";
     public static final String KEY_DISTANCE = "distance";
     public static final String KEY_ANGLE = "angle";
-    public static final String KEY_PROVIDER = "provider";
+    public static final String KEY_ACCURACY = "accuracy";
     public static final String KEY_STATUS = "status";
 
     private static final int PERMISSIONS_REQUEST_LOCATION = 2;
@@ -69,15 +69,14 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
     private PendingIntent alarmIntent;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (BuildConfig.HIDDEN_APP) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        if (BuildConfig.HIDDEN_APP && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             removeLauncherIcon();
         }
 
         setHasOptionsMenu(true);
 
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
 
@@ -132,6 +131,7 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
             startTrackingService(true, false);
         }
+
     }
 
     private void removeLauncherIcon() {
@@ -150,13 +150,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         }
     }
 
-    private boolean hasPermission(String permission) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return true;
-        }
-        return ContextCompat.checkSelfPermission(getActivity(), permission) == PackageManager.PERMISSION_GRANTED;
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -175,7 +168,7 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         findPreference(KEY_INTERVAL).setEnabled(enabled);
         findPreference(KEY_DISTANCE).setEnabled(enabled);
         findPreference(KEY_ANGLE).setEnabled(enabled);
-        findPreference(KEY_PROVIDER).setEnabled(enabled);
+        findPreference(KEY_ACCURACY).setEnabled(enabled);
     }
 
     @Override
@@ -202,9 +195,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         if (item.getItemId() == R.id.status) {
             startActivity(new Intent(getActivity(), StatusActivity.class));
             return true;
-        } else if (item.getItemId() == R.id.about) {
-            startActivity(new Intent(getActivity(), AboutActivity.class));
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -222,19 +212,18 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
 
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
-            Set<String> missingPermissions = new HashSet<>();
-            if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
-                missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
+            Set<String> requiredPermissions = new HashSet<>();
+            if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requiredPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
             }
-            if (!hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
-                missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+                    && ContextCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_BACKGROUND_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requiredPermissions.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION);
             }
-            if (missingPermissions.isEmpty()) {
-                permission = true;
-            } else {
+            permission = requiredPermissions.isEmpty();
+            if (!permission) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]),
-                            PERMISSIONS_REQUEST_LOCATION);
+                    requestPermissions(requiredPermissions.toArray(new String[requiredPermissions.size()]), PERMISSIONS_REQUEST_LOCATION);
                 }
                 return;
             }
@@ -242,18 +231,13 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
 
         if (permission) {
             setPreferencesEnabled(false);
-            ContextCompat.startForegroundService(getActivity(), new Intent(getActivity(), TrackingService.class));
+            ContextCompat.startForegroundService(getContext(), new Intent(getActivity(), TrackingService.class));
             alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                     ALARM_MANAGER_INTERVAL, ALARM_MANAGER_INTERVAL, alarmIntent);
         } else {
             sharedPreferences.edit().putBoolean(KEY_STATUS, false).apply();
-            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);
-            }
+            TwoStatePreference preference = findPreference(KEY_STATUS);
+            preference.setChecked(false);
         }
     }
 

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

@@ -1,126 +0,0 @@
-/*
- * Copyright 2015 - 2017 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;
-
-@SuppressWarnings("MissingPermission")
-public class MixedPositionProvider extends PositionProvider implements LocationListener, GpsStatus.Listener {
-
-    private static final 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);
-        try {
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, requestInterval, 0, this);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, e);
-        }
-    }
-
-    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) {
-                }
-            };
-
-            try {
-                locationManager.requestLocationUpdates(
-                        LocationManager.NETWORK_PROVIDER, requestInterval, 0, backupListener);
-            } catch (IllegalArgumentException e) {
-                Log.w(TAG, e);
-            }
-        }
-    }
-
-    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 - requestInterval > FIX_TIMEOUT) {
-            startBackupProvider();
-        }
-    }
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 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.

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,64 +20,55 @@ 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.preference.PreferenceManager;
 import android.util.Log;
 
 public abstract class PositionProvider {
 
-    protected static final String TAG = PositionProvider.class.getSimpleName();
+    private static final String TAG = PositionProvider.class.getSimpleName();
 
-    private static final int MINIMUM_INTERVAL = 1000;
+    protected static final int MINIMUM_INTERVAL = 1000;
 
     public interface PositionListener {
         void onPositionUpdate(Position position);
+        void onPositionError(Throwable error);
     }
 
-    private final PositionListener listener;
+    protected final PositionListener listener;
 
-    private final Context context;
-    protected final LocationManager locationManager;
+    protected final Context context;
+    protected SharedPreferences preferences;
 
-    private String deviceId;
-    protected String type;
-    protected long requestInterval;
+    protected String deviceId;
     protected long interval;
     protected double distance;
     protected double angle;
 
-    private Location lastLocation;
+    protected Location lastLocation;
 
     public PositionProvider(Context context, PositionListener listener) {
         this.context = context;
         this.listener = listener;
 
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         deviceId = preferences.getString(MainFragment.KEY_DEVICE, "undefined");
         interval = Long.parseLong(preferences.getString(MainFragment.KEY_INTERVAL, "600")) * 1000;
         distance = Integer.parseInt(preferences.getString(MainFragment.KEY_DISTANCE, "0"));
         angle = Integer.parseInt(preferences.getString(MainFragment.KEY_ANGLE, "0"));
-
-        if (distance > 0 || angle > 0) {
-            requestInterval = MINIMUM_INTERVAL;
-        } else {
-            requestInterval = interval;
-        }
-
-        type = preferences.getString(MainFragment.KEY_PROVIDER, "gps");
     }
 
     public abstract void startUpdates();
 
     public abstract void stopUpdates();
 
-    protected void updateLocation(Location location) {
+    public abstract void requestSingleLocation();
+
+    protected void processLocation(Location location) {
         if (location != null && (lastLocation == null
                 || location.getTime() - lastLocation.getTime() >= interval
-                || distance > 0 && DistanceCalculator.distance(location.getLatitude(), location.getLongitude(), lastLocation.getLatitude(), location.getLongitude()) >= distance
+                || distance > 0 && location.distanceTo(lastLocation) >= distance
                 || angle > 0 && Math.abs(location.getBearing() - lastLocation.getBearing()) >= angle)) {
             Log.i(TAG, "location new");
             lastLocation = location;
@@ -87,11 +78,14 @@ public abstract class PositionProvider {
         }
     }
 
-    public static double getBatteryLevel(Context context) {
+    protected static double getBatteryLevel(Context context) {
         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;
+        if (batteryIntent != null) {
+            int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+            int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
+            return (level * 100.0) / scale;
+        }
+        return 0;
     }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 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.
@@ -36,6 +36,10 @@ public class ProtocolFormatter {
                 .appendQueryParameter("accuracy", String.valueOf(position.getAccuracy()))
                 .appendQueryParameter("batt", String.valueOf(position.getBattery()));
 
+        if (position.getMock()) {
+            builder.appendQueryParameter("mock", String.valueOf(position.getMock()));
+        }
+
         if (alarm != null) {
             builder.appendQueryParameter("alarm", alarm);
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,24 @@
  */
 package org.traccar.client;
 
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.location.Location;
-import android.location.LocationManager;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 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;
+
 public class ShortcutActivity extends AppCompatActivity {
 
     public static final String EXTRA_ACTION = "action";
@@ -101,38 +100,30 @@ public class ShortcutActivity extends AppCompatActivity {
 
     @SuppressWarnings("MissingPermission")
     private void sendAlarm() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        PositionProviderFactory.create(this, new PositionProvider.PositionListener() {
+            @Override
+            public void onPositionUpdate(Position position) {
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ShortcutActivity.this);
+                String request = ProtocolFormatter.formatRequest(
+                        preferences.getString(MainFragment.KEY_URL, null), position, ALARM_SOS);
 
-        LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-
-        Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-        if (location == null) {
-            location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-        }
-
-        if (location != null) {
-
-            Position position = new Position(
-                    preferences.getString(MainFragment.KEY_DEVICE, null),
-                    location, PositionProvider.getBatteryLevel(this));
-
-            String request = ProtocolFormatter.formatRequest(
-                    preferences.getString(MainFragment.KEY_URL, null), position, ALARM_SOS);
-
-            RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
-                @Override
-                public void onComplete(boolean success) {
-                    if (success) {
-                        Toast.makeText(ShortcutActivity.this, R.string.status_send_success, Toast.LENGTH_SHORT).show();
-                    } else {
-                        Toast.makeText(ShortcutActivity.this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
+                RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        if (success) {
+                            Toast.makeText(ShortcutActivity.this, R.string.status_send_success, Toast.LENGTH_SHORT).show();
+                        } else {
+                            Toast.makeText(ShortcutActivity.this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
+                        }
                     }
-                }
-            });
+                });
+            }
 
-        } else {
-            Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
-        }
+            @Override
+            public void onPositionError(Throwable error) {
+                Toast.makeText(ShortcutActivity.this, error.getMessage(), Toast.LENGTH_LONG).show();
+            }
+        }).requestSingleLocation();
     }
 
     private boolean executeAction(Intent intent) {
@@ -158,7 +149,11 @@ public class ShortcutActivity extends AppCompatActivity {
                     Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
                     break;
                 case ACTION_SOS:
-                    sendAlarm();
+                    if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+                        sendAlarm();
+                    } else {
+                        Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
+                    }
                     break;
             }
             finish();

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

@@ -1,64 +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;
-import android.util.Log;
-
-@SuppressWarnings("MissingPermission")
-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() {
-        try {
-            locationManager.requestLocationUpdates(type, requestInterval, 0, this);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, e);
-        }
-    }
-
-    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,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import java.util.LinkedList;
 import java.util.Set;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -43,7 +43,7 @@ public class StatusActivity extends AppCompatActivity {
     }
 
     public static void addMessage(String message) {
-        DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT);
+        DateFormat format = DateFormat.getTimeInstance(DateFormat.MEDIUM);
         message = format.format(new Date()) + " - " + message;
         messages.add(message);
         while (messages.size() > LIMIT) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.traccar.client;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Handler;
-import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -41,35 +40,16 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private DatabaseHelper databaseHelper;
     private NetworkManager networkManager;
 
-    private PowerManager.WakeLock wakeLock;
-
-    private void lock() {
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
-    }
-
-    private void unlock() {
-        if (wakeLock.isHeld()) {
-            wakeLock.release();
-        }
-    }
-
     public TrackingController(Context context) {
         this.context = context;
         handler = new Handler();
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        if (preferences.getString(MainFragment.KEY_PROVIDER, "gps").equals("mixed")) {
-            positionProvider = new MixedPositionProvider(context, this);
-        } else {
-            positionProvider = new SimplePositionProvider(context, this);
-        }
+        positionProvider = PositionProviderFactory.create(context, this);
         databaseHelper = new DatabaseHelper(context);
         networkManager = new NetworkManager(context, this);
         isOnline = networkManager.isOnline();
 
         url = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value));
-
-        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
     }
 
     public void start() {
@@ -102,9 +82,14 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         }
     }
 
+    @Override
+    public void onPositionError(Throwable error) {
+    }
+
     @Override
     public void onNetworkUpdate(boolean isOnline) {
-        StatusActivity.addMessage(context.getString(R.string.status_connectivity_change));
+        int message = isOnline ? R.string.status_network_online : R.string.status_network_offline;
+        StatusActivity.addMessage(context.getString(message));
         if (!this.isOnline && isOnline) {
             read();
         }
@@ -132,7 +117,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private void write(Position position) {
         log("write", position);
-        lock();
         databaseHelper.insertPositionAsync(position, new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
             public void onComplete(boolean success, Void result) {
@@ -142,14 +126,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                         isWaiting = false;
                     }
                 }
-                unlock();
             }
         });
     }
 
     private void read() {
         log("read", null);
-        lock();
         databaseHelper.selectPositionAsync(new DatabaseHelper.DatabaseHandler<Position>() {
             @Override
             public void onComplete(boolean success, Position result) {
@@ -166,14 +148,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                 } else {
                     retry();
                 }
-                unlock();
             }
         });
     }
 
     private void delete(Position position) {
         log("delete", position);
-        lock();
         databaseHelper.deletePositionAsync(position.getId(), new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
             public void onComplete(boolean success, Void result) {
@@ -182,14 +162,12 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                 } else {
                     retry();
                 }
-                unlock();
             }
         });
     }
 
     private void send(final Position position) {
         log("send", position);
-        lock();
         String request = ProtocolFormatter.formatRequest(url, position);
         RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
             @Override
@@ -200,7 +178,6 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                     StatusActivity.addMessage(context.getString(R.string.status_send_fail));
                     retry();
                 }
-                unlock();
             }
         });
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,20 @@
  */
 package org.traccar.client;
 
+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.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+
+import android.os.PowerManager;
 import android.util.Log;
 
 public class TrackingService extends Service {
@@ -32,19 +36,28 @@ public class TrackingService extends Service {
     private static final String TAG = TrackingService.class.getSimpleName();
     private static final int NOTIFICATION_ID = 1;
 
+    private PowerManager.WakeLock wakeLock;
     private TrackingController trackingController;
 
     private static Notification createNotification(Context context) {
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0);
-        return new NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL)
-                .setContentTitle(context.getString(R.string.app_name))
-                .setContentText(context.getString(R.string.settings_status_on_summary))
-                .setContentIntent(pendingIntent)
-                .setPriority(NotificationCompat.PRIORITY_MIN)
-                .build();
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, MainApplication.PRIMARY_CHANNEL)
+                .setSmallIcon(R.drawable.ic_stat_notify)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setCategory(NotificationCompat.CATEGORY_SERVICE);
+        Intent intent;
+        if (!BuildConfig.HIDDEN_APP) {
+            intent = new Intent(context, MainActivity.class);
+            builder
+                .setContentTitle(context.getString(R.string.settings_status_on_summary))
+                .setTicker(context.getString(R.string.settings_status_on_summary))
+                .setColor(ContextCompat.getColor(context, R.color.primary_dark));
+        } else {
+            intent = new Intent(android.provider.Settings.ACTION_SETTINGS);
+        }
+        builder.setContentIntent(PendingIntent.getActivity(context, 0, intent, 0));
+        return builder.build();
     }
 
-    @TargetApi(Build.VERSION_CODES.ECLAIR)
     public static class HideNotificationService extends Service {
         @Override
         public IBinder onBind(Intent intent) {
@@ -64,16 +77,27 @@ public class TrackingService extends Service {
         }
     }
 
+    @SuppressLint("WakelockTimeout")
     @Override
     public void onCreate() {
         Log.i(TAG, "service create");
         StatusActivity.addMessage(getString(R.string.status_service_create));
 
-        trackingController = new TrackingController(this);
-        trackingController.start();
-
         startForeground(NOTIFICATION_ID, createNotification(this));
-        ContextCompat.startForegroundService(this, new Intent(this, HideNotificationService.class));
+
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+
+            PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
+            wakeLock.acquire();
+
+            trackingController = new TrackingController(this);
+            trackingController.start();
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            ContextCompat.startForegroundService(this, new Intent(this, HideNotificationService.class));
+        }
     }
 
     @Override
@@ -97,6 +121,9 @@ public class TrackingService extends Service {
 
         stopForeground(true);
 
+        if (wakeLock != null && wakeLock.isHeld()) {
+            wakeLock.release();
+        }
         if (trackingController != null) {
             trackingController.stop();
         }

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

@@ -18,7 +18,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.SparseArray;
 
 public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
@@ -26,7 +26,7 @@ public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
     private static final SparseArray<PowerManager.WakeLock> mActiveWakeLocks = new SparseArray<>();
     private static int mNextId = 1;
 
-    public static void startWakefulService(Context context, Intent intent) {
+    public static void startWakefulForegroundService(Context context, Intent intent) {
         synchronized (mActiveWakeLocks) {
             int id = mNextId;
             mNextId++;

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/layout/about.xml

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

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

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

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">عميل Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">بدء الخدمة</string>
+  <string name="shortcut_stop">توقف الخدمة</string>
+  <string name="shortcut_sos">ارسال استغاثة</string>
+  <string name="channel_default">القناة الاساسية</string>
   <string name="settings_id_title">معرف الجهاز</string>
   <string name="settings_url_title">رابط الخادم</string>
   <string name="settings_url_summary">رابط خادم التتبع</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">إيقاف</string>
   <string name="settings_status_off_summary">الخدمة توقفت</string>
   <string name="settings_status_on_summary">الخدمة تعمل</string>
-  <string name="settings_provider_title">موفر الموقع</string>
-  <string name="settings_provider_summary">مصدر بيانات الموقع</string>
-  <string name="settings_provider_gps">موفر نظام تحديد الموقع</string>
-  <string name="settings_provider_network">موفر الشبكة</string>
-  <string name="settings_provider_mixed">موفر المختلط</string>
+  <string name="settings_accuracy_title">دقة الموقع</string>
+  <string name="settings_accuracy_summary">دقة الموقع المطلوبة</string>
+  <string name="settings_accuracy_high">عالي</string>
+  <string name="settings_accuracy_medium">متوسط</string>
+  <string name="settings_accuracy_low">منخفض</string>
   <string name="settings_foreground_title">الخدمة الأمامية</string>
   <string name="settings_foreground_summary">زيادة أولوية الخدمة</string>
   <string name="menu_status">الحالة</string>
@@ -30,10 +34,13 @@
   <string name="about_description">محدد الموقع في الوقت الفعلي لأجهزة Android. متوافق مع خادم Traccar ونظم تعقب أخرى </string>
   <string name="about_license">هذا التطبيق مجاني ومفتوح المصدر، الكود المصدري مرخص تحت رخصة Apache الإصدار 2.0 و متاح على GitHub.</string>
   <string name="about_web">لمزيد من المعلومات زر \nwww.traccar.org/client</string>
+  <string name="status_service_create">بدأت الخدمة</string>
+  <string name="status_service_destroy">توقفت الخدمة</string>
   <string name="status_send_success">تم الإرسال بنجاح</string>
   <string name="status_send_fail">فشل الإرسال</string>
   <string name="status_location_update">تحديث الموقع</string>
-  <string name="status_connectivity_change">تغير الارتباط</string>
+  <string name="status_network_online">متصل بالشبكة</string>
+  <string name="status_network_offline">غير متصل بالشبكة</string>
   <string name="hidden_app_name">إعدادات الجهاز</string>
   <string name="hidden_alert">تم إخفاء التطبيق. لفتحه مجددا رجاءا اتصل بـ8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">أرجو إدخال رابط صحيح http:// أو https://</string>

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

@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar müştəri</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">xidmətə başla</string>
+  <string name="shortcut_stop">xidmət dayandırmaq</string>
+  <string name="shortcut_sos">sos göndərin</string>
+  <string name="channel_default">əsas kanal</string>
+  <string name="settings_id_title">Qurğu identifikatoru</string>
+  <string name="settings_url_title">Server URL</string>
+  <string name="settings_url_summary">Tracking server URL</string>
+  <string name="settings_interval_title">Frequency</string>
+  <string name="settings_interval_summary">Saniyə cədvəlləri bildirir</string>
+  <string name="settings_distance_title">Məsafə</string>
+  <string name="settings_distance_summary">Metr ölçən məsafə</string>
+  <string name="settings_angle_title">Angle</string>
+  <string name="settings_angle_summary">Dərəcə dərəcəsi hesabat</string>
+  <string name="settings_status_title">Xidmət vəziyyəti</string>
+  <string name="settings_status_off">Başlamaq</string>
+  <string name="settings_status_on">Dur</string>
+  <string name="settings_status_off_summary">Xidmət dayandı</string>
+  <string name="settings_status_on_summary">Xidmət davam edir</string>
+  <string name="settings_accuracy_title">Yer dəqiqliyi</string>
+  <string name="settings_accuracy_summary">İstədiyiniz yer dəqiqliyi</string>
+  <string name="settings_accuracy_high">Yüksək</string>
+  <string name="settings_accuracy_medium">Orta</string>
+  <string name="settings_accuracy_low">Aşağı</string>
+  <string name="settings_foreground_title">Ön xidməti</string>
+  <string name="settings_foreground_summary">Xidmət prioritetini artırın</string>
+  <string name="menu_status">vəziyyət</string>
+  <string name="menu_about">Haqqında</string>
+  <string name="menu_shortcuts">Qısa yollar əlavə edin</string>
+  <string name="menu_clear">Aydındır</string>
+  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
+  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">Xidmət başladı</string>
+  <string name="status_service_destroy">Xidmət dayandı</string>
+  <string name="status_send_success">Uğurla göndərin</string>
+  <string name="status_send_fail">Göndərmə uğursuz oldu</string>
+  <string name="status_location_update">Yer yeniləmə</string>
+  <string name="status_network_online">Şəbəkə online</string>
+  <string name="status_network_offline">Şəbəkə offline</string>
+  <string name="hidden_app_name">Qurğu Ayarları</string>
+  <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">Please enter a valid http:// or https:// URL</string>
+</resources>

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

@@ -2,7 +2,13 @@
 <resources>
   <string name="app_name">Traccar клиент</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Стартирай услугата</string>
+  <string name="shortcut_stop">Спри услугата</string>
+  <string name="shortcut_sos">Изпрати SOS</string>
+  <string name="channel_default">Основен канал</string>
   <string name="settings_id_title">Идентификатор</string>
+  <string name="settings_url_title">Адрес на сървъра</string>
+  <string name="settings_url_summary">Адрес на проследяващият сървър</string>
   <string name="settings_interval_title">Честота</string>
   <string name="settings_interval_summary">Докладван интервал в сек.</string>
   <string name="settings_distance_title">Разстояние</string>
@@ -14,11 +20,11 @@
   <string name="settings_status_on">Стоп</string>
   <string name="settings_status_off_summary">Услугата е спряна</string>
   <string name="settings_status_on_summary">Услугата работи</string>
-  <string name="settings_provider_title">Доставчик на местоположение</string>
-  <string name="settings_provider_summary">Източник на данни за местоположението</string>
-  <string name="settings_provider_gps">GPS</string>
-  <string name="settings_provider_network">Мрежи</string>
-  <string name="settings_provider_mixed">Смесен Доставчик</string>
+  <string name="settings_accuracy_title">Точност на местоположението</string>
+  <string name="settings_accuracy_summary">Желана точност на местоположението</string>
+  <string name="settings_accuracy_high">Висока</string>
+  <string name="settings_accuracy_medium">Средна</string>
+  <string name="settings_accuracy_low">Ниска</string>
   <string name="settings_foreground_title">Foreground service</string>
   <string name="settings_foreground_summary">Увеличаване на приоритета на услугата</string>
   <string name="menu_status">Състояние</string>
@@ -28,10 +34,14 @@
   <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
   <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
   <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">Услугата стартира</string>
+  <string name="status_service_destroy">Услугата спряна</string>
   <string name="status_send_success">Успешно изпращане</string>
   <string name="status_send_fail">Грешка в изпращането</string>
   <string name="status_location_update">Местоположението е обновено</string>
-  <string name="status_connectivity_change">Промяна в свързването</string>
+  <string name="status_network_online">Има връзка с мрежата</string>
+  <string name="status_network_offline">Няма връзка с мрежа</string>
   <string name="hidden_app_name">Настройки</string>
   <string name="hidden_alert">Приложението е скрито. За да го отворите отново, моля наберете 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">Моля въведете валиден адрес</string>
 </resources>

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

@@ -16,11 +16,6 @@
   <string name="settings_status_on">বন্ধ</string>
   <string name="settings_status_off_summary">সার্ভিস বন্ধ হয়েছে</string>
   <string name="settings_status_on_summary">সার্ভিস চলমান</string>
-  <string name="settings_provider_title">লোকেশন প্রদানকারী</string>
-  <string name="settings_provider_summary">লোকেশন ডেটা উৎস</string>
-  <string name="settings_provider_gps">জিপিএস প্রদানকারী</string>
-  <string name="settings_provider_network">নেটওয়ার্ক প্রদানকারী</string>
-  <string name="settings_provider_mixed">মিশ্র প্রদানকারী</string>
   <string name="settings_foreground_title">ফোরগ্রাউন্ড সার্ভিস</string>
   <string name="settings_foreground_summary">সার্ভিসের পূর্ববর্তিতা বৃদ্ধি</string>
   <string name="menu_status">অবস্থা</string>
@@ -33,7 +28,6 @@
   <string name="status_send_success">সফলভাবে পাঠান হয়েছে</string>
   <string name="status_send_fail">পাঠান ব্যর্থ হয়েছে</string>
   <string name="status_location_update">অবস্থান আপডেট</string>
-  <string name="status_connectivity_change">সংযোগ পরিবর্তন হয়েছে</string>
   <string name="hidden_app_name">ডিভাইস সেটিংস</string>
   <string name="hidden_alert">অ্যাপ্লিকেশনটি লুকানো আছে। আবার খুলতে ডায়াল করুন 8722227 (TRACCAR)।</string>
   <string name="error_msg_invalid_url">দয়া করে একটি ভ্যালিড http:// বা https:// URL লিখুন</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Spustit službu</string>
+  <string name="shortcut_stop">Zastavit službu</string>
+  <string name="shortcut_sos">Odeslat SOS</string>
+  <string name="channel_default">Primární kanál</string>
   <string name="settings_id_title">Identifikátor zařízení</string>
   <string name="settings_url_title">URL serveru</string>
   <string name="settings_url_summary">URL sledovacího serveru</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Zastaveno</string>
   <string name="settings_status_on_summary">Spuštěno</string>
-  <string name="settings_provider_title">Poskytovatel zaměření</string>
-  <string name="settings_provider_summary">Zdroj zaměřovacích dat</string>
-  <string name="settings_provider_gps">GPS</string>
-  <string name="settings_provider_network">Mobilní síť</string>
-  <string name="settings_provider_mixed">Obojí</string>
+  <string name="settings_accuracy_title">Přesnost umístění</string>
+  <string name="settings_accuracy_summary">Požadovaná přesnost umístění</string>
+  <string name="settings_accuracy_high">Vysoká</string>
+  <string name="settings_accuracy_medium">Střední</string>
+  <string name="settings_accuracy_low">Nízká</string>
   <string name="settings_foreground_title">Popředí služba</string>
   <string name="settings_foreground_summary">Zvýšit prioritu služba</string>
   <string name="menu_status">Stav</string>
@@ -30,10 +34,13 @@
   <string name="about_description">GPS sledovací aplikace pracující v reálném čase pro zařízení s operačním systémem Android. Kompatibilní s Traccar serverem a dalšími sledovacími systémy.</string>
   <string name="about_license">Tato aplikace je zdarma a open source, zdrojový kód je licencován pod Apache License Version 2.0 a je přístupný na GitHub.</string>
   <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
+  <string name="status_service_create">Služba spuštěna</string>
+  <string name="status_service_destroy">Služba zastavena</string>
   <string name="status_send_success">Úspěšně odesláno</string>
   <string name="status_send_fail">Odesílání selhalo</string>
   <string name="status_location_update">Aktualizace pozice</string>
-  <string name="status_connectivity_change">Změna připojení</string>
+  <string name="status_network_online">Síť online</string>
+  <string name="status_network_offline">Síť offile</string>
   <string name="hidden_app_name">Nastavení zařízení</string>
   <string name="hidden_alert">Aplikace byla skryta. Pro znovuotevření vytočte 8722227 (TRACCAR)</string>
   <string name="error_msg_invalid_url">Prosím vložte platnou http:// nebo https:// URL</string>

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

@@ -2,39 +2,39 @@
 <resources>
   <string name="app_name">Traccar klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Start tjenesten</string>
+  <string name="shortcut_stop">Stop tjenesten</string>
+  <string name="shortcut_sos">Send SOS</string>
+  <string name="channel_default">Primær kanal</string>
   <string name="settings_id_title">Enheds ID</string>
   <string name="settings_url_title">Server Adresse</string>
   <string name="settings_url_summary">Tracking server adresse</string>
-  <string name="settings_interval_title">Tracking interval</string>
-  <string name="settings_interval_summary">Rapporterings interval i sekunder</string>
-  <string name="settings_distance_title">Distance</string>
-  <string name="settings_distance_summary">Rapportering distance i meter</string>
-  <string name="settings_angle_title">vinkel</string>
-  <string name="settings_angle_summary">Rapportering i grader</string>
-  <string name="settings_status_title">Service status</string>
+  <string name="settings_interval_title">Periode mellem registreringer</string>
+  <string name="settings_interval_summary">Angiv periode i sekunder</string>
+  <string name="settings_distance_title">Afstand mellem registreringer</string>
+  <string name="settings_distance_summary">Angiv afstand i meter</string>
+  <string name="settings_angle_title">Retningsændring som udløser ny registrering</string>
+  <string name="settings_angle_summary">Angiv retningsændring i grader</string>
+  <string name="settings_status_title">Status af tjenesten</string>
   <string name="settings_status_off">Start</string>
   <string name="settings_status_on">Stop</string>
-  <string name="settings_status_off_summary">Service stoppet</string>
-  <string name="settings_status_on_summary">Service er aktiv</string>
-  <string name="settings_provider_title">Udbyder</string>
-  <string name="settings_provider_summary">Udbyder lokaliseringsdata</string>
-  <string name="settings_provider_gps">GPS udbyder</string>
-  <string name="settings_provider_network">Netværks udbyder</string>
-  <string name="settings_provider_mixed">Mixet udbyder</string>
+  <string name="settings_status_off_summary">Tjenesten stoppet</string>
+  <string name="settings_status_on_summary">Tjenesten er aktiv</string>
   <string name="settings_foreground_title">Forgrunds tjeneste</string>
   <string name="settings_foreground_summary">Øg tjeneste prioritet</string>
   <string name="menu_status">Status</string>
   <string name="menu_about">Om</string>
   <string name="menu_shortcuts">Tilføj genveje</string>
-  <string name="menu_clear">Tilbage</string>
+  <string name="menu_clear">Slet</string>
   <string name="about_description">Real tid`s GPS tracker for Android enheder. Kompatibel med Traccar Server og andre tracking systemer.</string>
-  <string name="about_license">Denne application er en fri og open source, source koden er licenseret under Apache License Version 2.0 og tilgængelig på GitHub.</string>
+  <string name="about_license">Denne application er gratis og open source. Kildekoden er licenseret under Apache License Version 2.0 og tilgængelig på GitHub.</string>
   <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
+  <string name="status_service_create">Tjenesten kører</string>
+  <string name="status_service_destroy">Tjenesten er stoppet</string>
   <string name="status_send_success">Send succesfuld</string>
   <string name="status_send_fail">Send fejlede</string>
   <string name="status_location_update">Placering opdateret</string>
-  <string name="status_connectivity_change">Connectivity forandring</string>
   <string name="hidden_app_name">Enheds indstillinger</string>
   <string name="hidden_alert">Appen er skjult. For at åbne appen igen skal du ringe til 8722227 (TRACCAR)</string>
-  <string name="error_msg_invalid_url">Indtast valid http:// eller https:/ adresse</string>
+  <string name="error_msg_invalid_url">Indtast gyldig http:// eller https:// adresse</string>
 </resources>

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

@@ -20,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Dienst inaktiv</string>
   <string name="settings_status_on_summary">Dienst aktiv</string>
-  <string name="settings_provider_title">Datenherkunft</string>
-  <string name="settings_provider_summary">Quelle der Positionsdaten</string>
-  <string name="settings_provider_gps">GPS-Provider</string>
-  <string name="settings_provider_network">Netzwerk-Provider</string>
-  <string name="settings_provider_mixed">Gemischt</string>
+  <string name="settings_accuracy_title">Positionsgenauigkeit</string>
+  <string name="settings_accuracy_summary">Erwünschte Positionsgenauigkeit</string>
+  <string name="settings_accuracy_high">Hoch</string>
+  <string name="settings_accuracy_medium">Mittel</string>
+  <string name="settings_accuracy_low">Niedrig</string>
   <string name="settings_foreground_title">Vordergrund Service</string>
   <string name="settings_foreground_summary">Servicepriorität erhöhen</string>
   <string name="menu_status">Status</string>
@@ -39,7 +39,8 @@
   <string name="status_send_success">Erfolgreich gesendet</string>
   <string name="status_send_fail">Übertragung fehlerhaft</string>
   <string name="status_location_update">Positionsupdate</string>
-  <string name="status_connectivity_change">Anschlusswechsel</string>
+  <string name="status_network_online">Netzwerk online</string>
+  <string name="status_network_offline">Netzwerk offline</string>
   <string name="hidden_app_name">Geräteeinstellungen</string>
   <string name="hidden_alert">Die App wurde versteckt. Um sie wieder zu öffnen, wähle 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Bitte eine gültige http:// oder https:// URL eingeben</string>

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

@@ -2,18 +2,29 @@
 <resources>
   <string name="app_name">πελάτης Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Εκκίνηση υπηρεσίας</string>
+  <string name="shortcut_stop">Διακοπή υπηρεσίας</string>
+  <string name="shortcut_sos">Αποστολή SOS</string>
+  <string name="channel_default">Κύριο Κανάλι</string>
   <string name="settings_id_title">Αναγνωριστικό συσκευής</string>
+  <string name="settings_url_title">Διεύθυνση εξυπηρετητή</string>
+  <string name="settings_url_summary">Διεύθυνση εξυπηρετητή παρακολούθησης</string>
   <string name="settings_interval_title">Συχνότητα</string>
+  <string name="settings_interval_summary">Διάστημα αναφορών σε δευτερόλεπτα</string>
+  <string name="settings_distance_title">Απόσταση</string>
+  <string name="settings_distance_summary">Απόσταση αναφορών σε μέτρα</string>
+  <string name="settings_angle_title">Γωνία</string>
+  <string name="settings_angle_summary">Γωνία αναφορών σε μοίρες</string>
   <string name="settings_status_title">Κατάσταση υπηρεσίας</string>
   <string name="settings_status_off">Εκκίνηση</string>
   <string name="settings_status_on">Παύση</string>
   <string name="settings_status_off_summary">Η υπηρεσία σταμάτησε</string>
   <string name="settings_status_on_summary">Η υπηρεσία εκτελείται</string>
-  <string name="settings_provider_title">Παροχέας τοποθεσίας</string>
-  <string name="settings_provider_summary">Πηγή δεδομένων τοποθεσίας</string>
-  <string name="settings_provider_gps">Παροχή GPS</string>
-  <string name="settings_provider_network">Παροχή δικτύου</string>
-  <string name="settings_provider_mixed">Μεικτή παροχή</string>
+  <string name="settings_accuracy_title">Ακρίβεια θέσης</string>
+  <string name="settings_accuracy_summary">Επιθυμητή ακρίβεια θέσης</string>
+  <string name="settings_accuracy_high">Υψηλό</string>
+  <string name="settings_accuracy_medium">Μέσο</string>
+  <string name="settings_accuracy_low">Χαμηλό</string>
   <string name="settings_foreground_title">Υπηρεσία προσκηνίου</string>
   <string name="settings_foreground_summary">Αύξηση προτεραιότητας της υπηρεσίας</string>
   <string name="menu_status">Κατάσταση</string>
@@ -23,9 +34,14 @@
   <string name="about_description">GPS ιχνηλάτης πραγματικού χρόνου για συσκευές Android. Συμβατός με Traccar και άλλα συστήματα ιχνηλάτησης.</string>
   <string name="about_license">Εφαρμογή Ελεύθερου και Ανοικτού κώδικα. Ο πηγαίος κώδικας παρέχεται με άδεια Apache 2.0 και διατίθεται στο GitHub.</string>
   <string name="about_web">Για περισσότερες πληροφορίες επισκεφτείτε\nwww.traccar.org/client</string>
+  <string name="status_service_create">Η Υπηρεσία εκκινήθηκε</string>
+  <string name="status_service_destroy">Η Υπηρεσία διακόπηκε</string>
+  <string name="status_send_success">Απεστάλη επιτυχώς</string>
   <string name="status_send_fail">Αποτυχημένη αποστολή</string>
   <string name="status_location_update">Ενημέρωση τοποθεσίας</string>
-  <string name="status_connectivity_change">Αλλαγή στη διασύνδεση</string>
+  <string name="status_network_online">Ενεργό δίκτυο</string>
+  <string name="status_network_offline">Ανενεργό δίκτυο</string>
   <string name="hidden_app_name">Ρυθμίσεις συσκευής</string>
   <string name="hidden_alert">Η εφαρμογή αποκρύφτηκε. Για να προβληθεί καλέστε 8722227 (TRACCAR)</string>
+  <string name="error_msg_invalid_url">Παρακαλώ εισάγετε μία έγκυρη http:// ή https:// διεύθυνση</string>
 </resources>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Cliente Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Iniciar servicio</string>
+  <string name="shortcut_stop">Detener servicio</string>
+  <string name="shortcut_sos">Enviar SOS</string>
+  <string name="channel_default">Canal primario</string>
   <string name="settings_id_title">Identificador de dispositivo</string>
   <string name="settings_url_title">URL del servidor</string>
   <string name="settings_url_summary">URL del servidor de seguimiento</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Desactivado</string>
   <string name="settings_status_off_summary">Servicio detenido</string>
   <string name="settings_status_on_summary">Servicio en ejecución</string>
-  <string name="settings_provider_title">Proveedor de localización</string>
-  <string name="settings_provider_summary">Fuente de los datos de localización</string>
-  <string name="settings_provider_gps">Proveedor GPS</string>
-  <string name="settings_provider_network">Proveedor de red</string>
-  <string name="settings_provider_mixed">Proveedor mixto</string>
+  <string name="settings_accuracy_title">Precisión</string>
+  <string name="settings_accuracy_summary">Precisión deseada</string>
+  <string name="settings_accuracy_high">Alto</string>
+  <string name="settings_accuracy_medium">Medio</string>
+  <string name="settings_accuracy_low">Bajo</string>
   <string name="settings_foreground_title">Servicio en primer plano</string>
   <string name="settings_foreground_summary">Aumentar prioridad del servicio</string>
   <string name="menu_status">Estado</string>
@@ -31,10 +35,13 @@
   <string name="about_license">Esta aplición es gratuíta y de código abierto. El código fuente está bajo la Licencia Apache Versión 2 y disponible en Github.</string>
   <string name="about_web">Para más información visite
 www.traccar.org/client</string>
+  <string name="status_service_create">Servicio iniciado</string>
+  <string name="status_service_destroy">Servicio detenido</string>
   <string name="status_send_success">Enviado correctamente</string>
   <string name="status_send_fail">Falló el envío</string>
   <string name="status_location_update">Actualización de localización</string>
-  <string name="status_connectivity_change">Cambio en la conectividad</string>
+  <string name="status_network_online">Red en línea</string>
+  <string name="status_network_offline">Red fuera de línea</string>
   <string name="hidden_app_name">Ajustes del dispositivo</string>
   <string name="hidden_alert">La aplicación se ha ocultado. Para abrirla de nuevo por favor marque 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Por favor. Introduzca una URL válida http:// ó https:// </string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">ردیاب Traccar</string>
   <string name="app_logo">ردیاب Traccar</string>
+  <string name="shortcut_start">شروع کار</string>
+  <string name="shortcut_stop">توقف کار</string>
+  <string name="shortcut_sos">ارسال پیام اضطراری</string>
+  <string name="channel_default">شبکه اولیه</string>
   <string name="settings_id_title">کد هویت دستگاه</string>
   <string name="settings_url_title">مسیر آدرس سرور</string>
   <string name="settings_url_summary">مسیر آدرس سرور مسیریاب</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">توقف</string>
   <string name="settings_status_off_summary">سرویس متوقف است</string>
   <string name="settings_status_on_summary">سرویس در حال کار است</string>
-  <string name="settings_provider_title">ارائه مکان</string>
-  <string name="settings_provider_summary">سورس اطلاعات مکان</string>
-  <string name="settings_provider_gps">ارائه GPS</string>
-  <string name="settings_provider_network">ارائه شبکه اپراتور</string>
-  <string name="settings_provider_mixed">ارائه ترکیبی</string>
+  <string name="settings_accuracy_title">دقت مکان</string>
+  <string name="settings_accuracy_summary">دقت مکان دلخواه</string>
+  <string name="settings_accuracy_high">زیاد</string>
+  <string name="settings_accuracy_medium">متوسط</string>
+  <string name="settings_accuracy_low">کم</string>
   <string name="settings_foreground_title">سرویس پیش زمینه</string>
   <string name="settings_foreground_summary">افزایش اولویت سرویس</string>
   <string name="menu_status">وضعیت</string>
@@ -31,10 +35,13 @@
   <string name="about_license">این نرم افزار مجانی و سورس باز تحت لیسانس Apache  نگارش 2.0 و فعال در GitHub.</string>
   <string name="about_web">برای کسب اطلاعات بیشتر به سایت زیر مراجعه نمایید.
 www.traccar.org/client</string>
+  <string name="status_service_create">کار شروع شد</string>
+  <string name="status_service_destroy">کار متوقف شد</string>
   <string name="status_send_success">ارسال موفق</string>
   <string name="status_send_fail">ارسال ناموفق</string>
   <string name="status_location_update">به روز رسانی مکان</string>
-  <string name="status_connectivity_change">تغییرات در ارتباطات</string>
+  <string name="status_network_online">شبکه آنلاین</string>
+  <string name="status_network_offline">شبکه آفلاین</string>
   <string name="hidden_app_name">تنظیمات دستگاه</string>
   <string name="hidden_alert">نرم افزار مخفی است . جهت نمایش آن با این شماره تماس بگیرید.
 8722227 (Traccar)</string>

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

@@ -2,9 +2,13 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
-  <string name="settings_id_title">Laitteen tunniste</string>
+  <string name="shortcut_start">Käynnistä palvelu</string>
+  <string name="shortcut_stop">Pysäytä palvelu</string>
+  <string name="shortcut_sos">Lähetä SOS-viesti</string>
+  <string name="channel_default">Ensisijainen kanava</string>
+  <string name="settings_id_title">Laitteen ID</string>
   <string name="settings_url_title">Palvelimen URL</string>
-  <string name="settings_url_summary">Jäljityspalvelimen URL-osoite</string>
+  <string name="settings_url_summary">Paikannuspalvelimen URL-osoite</string>
   <string name="settings_interval_title">Taajuus</string>
   <string name="settings_interval_summary">Raportointiväli sekunneissa</string>
   <string name="settings_distance_title">Matka</string>
@@ -16,22 +20,27 @@
   <string name="settings_status_on">Pysäytä</string>
   <string name="settings_status_off_summary">Palvelu pysäytetty</string>
   <string name="settings_status_on_summary">Palvelu käynnissä</string>
-  <string name="settings_provider_title">Sijainnin tarjoaja</string>
-  <string name="settings_provider_summary">Sijaintidatan lähde</string>
-  <string name="settings_provider_gps">GPS satelliiti</string>
-  <string name="settings_provider_network">Matkapuhelinverkko</string>
-  <string name="settings_provider_mixed">Yhdistelmä</string>
+  <string name="settings_accuracy_title">Sijainnin tarkkuus</string>
+  <string name="settings_accuracy_summary">Haluttu sijainnin tarkkuus</string>
+  <string name="settings_accuracy_high">Korkea</string>
+  <string name="settings_accuracy_medium">Keskitasoinen</string>
+  <string name="settings_accuracy_low">Matala</string>
+  <string name="settings_foreground_title">Edustapalvelu</string>
+  <string name="settings_foreground_summary">Lisää palvelun prioriteettia</string>
   <string name="menu_status">Tila</string>
-  <string name="menu_about">About</string>
+  <string name="menu_about">Tietoja</string>
   <string name="menu_shortcuts">Lisää pikakuvakkeet</string>
   <string name="menu_clear">Tyhjennä</string>
-  <string name="about_description">Reaaliaikainen GPS-jäljitin Android-laitteille. Yhteensopiva Traccar Serverin ja muiden jäljitysjärjestelmien kanssa.</string>
+  <string name="about_description">Reaaliaikainen GPS-paikannin Android-laitteille. Yhteensopiva Traccar-palvelimen ja muiden paikannusjärjestelmien kanssa.</string>
   <string name="about_license">Tämä sovellus on vapaata ja avointa lähdekoodia. Lähdekoodi on lisensoitu Apache License Version 2.0 -lisenssillä ja on saatavilla GitHubissa.</string>
-  <string name="about_web">Lisätietoa on osoitteessa\nwww.traccar.org/client</string>
+  <string name="about_web">Lisätietoa saat osoitteessa: \nwww.traccar.org/client</string>
+  <string name="status_service_create">Palvelu käynnistynyt</string>
+  <string name="status_service_destroy">Palvelu pysähtyi</string>
   <string name="status_send_success">Lähetys onnistui</string>
   <string name="status_send_fail">Lähetys epäonnistui</string>
   <string name="status_location_update">Sijainnin päivitys</string>
-  <string name="status_connectivity_change">Muutos yhteydessä</string>
+  <string name="status_network_online">Yhdistetty verkkoon</string>
+  <string name="status_network_offline">Verkkoyhteys katkennut</string>
   <string name="hidden_app_name">Laitteen asetukset</string>
   <string name="hidden_alert">Sovellus on piilotettu. Näppäile 8722227 (TRACCAR) avataksesi sovelluksen uudelleen.</string>
   <string name="error_msg_invalid_url">Syötä kelvollinen http:// tai https:// URL-osoite</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Client Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Démarrer le service</string>
+  <string name="shortcut_stop">Arrêter le service</string>
+  <string name="shortcut_sos">Envoyer un SOS</string>
+  <string name="channel_default">Canal primaire</string>
   <string name="settings_id_title">Identifiant de l\'appareil</string>
   <string name="settings_url_title">URL du serveur</string>
   <string name="settings_url_summary">URL du serveur de suivi</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Arrêter</string>
   <string name="settings_status_off_summary">Arrêté</string>
   <string name="settings_status_on_summary">En marche</string>
-  <string name="settings_provider_title">Source de localisation</string>
-  <string name="settings_provider_summary">Source utilisée par le système afin d\'obtenir la localisation de l\'appareil</string>
-  <string name="settings_provider_gps">Mode GPS uniquement</string>
-  <string name="settings_provider_network">Mode cellulaire uniquement</string>
-  <string name="settings_provider_mixed">Mode hybride</string>
+  <string name="settings_accuracy_title">Precision de la localisation</string>
+  <string name="settings_accuracy_summary">Précision de localisation désirée</string>
+  <string name="settings_accuracy_high">Haut</string>
+  <string name="settings_accuracy_medium">Moyen</string>
+  <string name="settings_accuracy_low">Bas</string>
   <string name="settings_foreground_title">Un service de premier plan</string>
   <string name="settings_foreground_summary">Augmenter la priorité de service</string>
   <string name="menu_status">Etat</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Suivi GPS en temps réels pour appareils Android. Compatible avec le serveur Traccar ainsi que d\'autres plateformes de suivi.</string>
   <string name="about_license">Cette application open source est gratuite. Le code source est disponible sur GitHub est sous licence Apache Version 2.0.</string>
   <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
+  <string name="status_service_create">Service démarré</string>
+  <string name="status_service_destroy">Service arrêté</string>
   <string name="status_send_success">Envoyé avec succès</string>
   <string name="status_send_fail">L’envoi a échoué</string>
   <string name="status_location_update">Localisation mise à jour</string>
-  <string name="status_connectivity_change">Changement de connectivité</string>
+  <string name="status_network_online">Réseau connecté</string>
+  <string name="status_network_offline">Réseau déconnecté</string>
   <string name="hidden_app_name">Paramètres de l\'appareil</string>
   <string name="hidden_alert">Cette application a été cachée. Pour l\'ouvrir à nouveau, composez le 8722227 (TRACCAR)</string>
   <string name="error_msg_invalid_url">S\'il vous plait, entrer un URL http:// ou https:// valide</string>

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

@@ -1,30 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">שרלוק לאנדרויד</string>
-  <string name="app_logo">שרלוק</string>
+  <string name="app_name"> Traccar לאנדרויד</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">הפעל שירות </string>
+  <string name="shortcut_stop">עצור תהליך</string>
+  <string name="shortcut_sos">שלח הודעת חירום</string>
+  <string name="channel_default">ערוץ ראשי</string>
   <string name="settings_id_title">מזהה מכשיר</string>
+  <string name="settings_url_title">כתובת שרת</string>
+  <string name="settings_url_summary">כתובת שרת איתור</string>
   <string name="settings_interval_title">תדירות</string>
+  <string name="settings_interval_summary">זמן דיווח בשניות </string>
+  <string name="settings_distance_title">מרחק</string>
+  <string name="settings_distance_summary">דיווח מרחק במטרים</string>
+  <string name="settings_angle_title">זווית</string>
+  <string name="settings_angle_summary">דיווח פניות בזווית </string>
   <string name="settings_status_title">מצב שירות</string>
   <string name="settings_status_off">הפעל</string>
   <string name="settings_status_on">עצור</string>
   <string name="settings_status_off_summary">השירות הופסק</string>
   <string name="settings_status_on_summary">השירות פועל</string>
-  <string name="settings_provider_title">ספק מיקום</string>
-  <string name="settings_provider_summary">ספק מיקום</string>
-  <string name="settings_provider_gps">GPS</string>
-  <string name="settings_provider_network">רשת</string>
-  <string name="settings_provider_mixed">GPS + רשת</string>
+  <string name="settings_accuracy_title">דיוק מיקום</string>
+  <string name="settings_accuracy_summary">דיוק מיקום מבוקש</string>
+  <string name="settings_accuracy_high">מדוייק </string>
+  <string name="settings_accuracy_medium">בינוני</string>
+  <string name="settings_accuracy_low">נמוך - משתמש רק בGPS של המכשיר </string>
+  <string name="settings_foreground_title">אפשר הפעלה ברקע</string>
   <string name="settings_foreground_summary">הגדל את עדיפות התוכנה</string>
   <string name="menu_status">סטטוס</string>
   <string name="menu_about">אודות</string>
   <string name="menu_shortcuts">הוסף קיצור דרך</string>
   <string name="menu_clear">נקה</string>
-  <string name="about_description">GPS Tracker בזמן אמת עבור מכשירי אנדרואיד</string>
+  <string name="about_description">מכשיר איתור  בזמן אמת עבור מכשירי אנדרואיד</string>
   <string name="about_license">יישום זה הוא קוד פתוח, קוד המקור מורשה תחת רישיון Apache גירסה 2.0 וזמין על GitHub.</string>
-  <string name="about_web">לפרטים נוספים ניתן לפנות לרוגב מחשבים 09-7469155 / www.sherlock.co.il או visit\nwww.traccar.org/client</string>
+  <string name="about_web">לפרטים נוספים    www.traccar.org/client</string>
+  <string name="status_service_create">אפליקציה הופעלה</string>
+  <string name="status_service_destroy">אפליקציה הופסקה</string>
   <string name="status_send_success">נשלח בהצלחה</string>
   <string name="status_send_fail">שליחה נכשלה</string>
   <string name="status_location_update">עדכון מיקום</string>
-  <string name="status_connectivity_change">שינוי חיבור</string>
+  <string name="status_network_online">רשת באונליין </string>
+  <string name="status_network_offline">רשת מנותקת</string>
   <string name="hidden_app_name">הגדרות המכשיר</string>
+  <string name="hidden_alert">האפליקציה הוסתרה. כדי לפתוח אותה שוב חייג בטלפון 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">הזן כתובת חוקית  http:// או  https:// URL</string>
 </resources>

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

@@ -2,20 +2,31 @@
 <resources>
   <string name="app_name">ट्रैक्कार क्लाइंट </string>
   <string name="app_logo">ट्रैक्कार</string>
+  <string name="shortcut_start">प्रारंभ</string>
+  <string name="shortcut_stop">रोक</string>
+  <string name="shortcut_sos">मुसीबत का इशारा</string>
+  <string name="channel_default">डिफ़ॉल्ट</string>
   <string name="settings_id_title">उपकरण पहचानकर्ता</string>
+  <string name="settings_url_title">यूआरएल शीर्षक</string>
+  <string name="settings_url_summary">यूआरएल सारांश</string>
   <string name="settings_interval_title">फ्रीक्वेंसी / आवृत्ति</string>
+  <string name="settings_interval_summary">अंतराल सारांश</string>
+  <string name="settings_distance_title">दूरी शीर्षक</string>
+  <string name="settings_distance_summary">दूरी सारांश</string>
+  <string name="settings_angle_title">कोण शीर्षक</string>
+  <string name="settings_angle_summary">कोण सारांश</string>
   <string name="settings_status_title">सेवा की स्थिति</string>
   <string name="settings_status_off">आरम्भ</string>
   <string name="settings_status_on">रोकें</string>
   <string name="settings_status_off_summary">सेवा रुक गई है</string>
   <string name="settings_status_on_summary">सेवा चल रही है</string>
-  <string name="settings_provider_title">जगह / स्थान / स्तिथि प्रदाता</string>
-  <string name="settings_provider_summary">जगह / स्थान / स्तिथि डेटा का स्रोत</string>
-  <string name="settings_provider_gps">जीपीएस प्रदाता</string>
-  <string name="settings_provider_network">नेटवर्क प्रदाता</string>
-  <string name="settings_provider_mixed">मिश्रित प्रदाता</string>
-  <string name="settings_foreground_title">अग्रभूमि सेवा</string>
-  <string name="settings_foreground_summary">सेवा प्राथमिकता बढ़ाएँ</string>
+  <string name="settings_accuracy_title">सटीकता शीर्षक</string>
+  <string name="settings_accuracy_summary">सटीकता सारांश</string>
+  <string name="settings_accuracy_high">सटीकता उच्च</string>
+  <string name="settings_accuracy_medium">सटीकता माध्यम</string>
+  <string name="settings_accuracy_low">सटीकता कम</string>
+  <string name="settings_foreground_title">अग्रभूमि शीर्षका</string>
+  <string name="settings_foreground_summary">अग्रभूमि सारांश</string>
   <string name="menu_status">स्थिति</string>
   <string name="menu_about">बारे में</string>
   <string name="menu_shortcuts">शॉर्टकट्स जोड़ें</string>
@@ -23,9 +34,14 @@
   <string name="about_description">एंड्रॉयड उपकरणों के लिए वास्तविक समय जीपीएस ट्रैकर। ट्रैक्कार सर्वर और अन्य  ट्रैकिंग प्रणालियों के साथ अनुकूल।</string>
   <string name="about_license">इस एप्लिकेशन के पास स्वतंत्र और खुला स्रोत है  , स्रोत कोड अपाचे लाइसेंस संस्करण 2.0 और GitHub के अंतर्गत उपलब्ध लाइसेंस प्राप्त है ।</string>
   <string name="about_web">अधिक जानकारी के लिए www.traccar.org/client वेबसाइट देखें </string>
+  <string name="status_service_create">सेवा बनाएँ</string>
+  <string name="status_service_destroy">सेवा नष्ट</string>
+  <string name="status_send_success">सफलता भेजें</string>
   <string name="status_send_fail">भेजना विफल हो गया है </string>
   <string name="status_location_update">जगह / स्थान / स्तिथि का अद्यतन / ताजी जानकारी</string>
-  <string name="status_connectivity_change">कनेक्टिविटी / संयोजकता परिवर्तन</string>
+  <string name="status_network_online">नेटवर्क ऑनलाइन</string>
+  <string name="status_network_offline">नेटवर्क ऑफ़लाइन</string>
   <string name="hidden_app_name">उपकरण की सेटिंग्स</string>
   <string name="hidden_alert">एप्लिकेशन को छुपा दिया गया है l इसे फिर से खोलने के लिए डायल करें 8722227 ( TRACCAR ) l</string>
+  <string name="error_msg_invalid_url">अवैध यूआरएल त्रुटि संदेश</string>
 </resources>

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

@@ -2,6 +2,8 @@
 <resources>
   <string name="app_name">Traccar klijent</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Pokreni servis</string>
+  <string name="shortcut_stop">Zaustavi servis</string>
   <string name="settings_id_title">Identifikator uređaja</string>
   <string name="settings_url_title">Adresa poslužitelja</string>
   <string name="settings_url_summary">Adresa poslužitelja za praćenje</string>
@@ -16,11 +18,10 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Servis zaustavljen</string>
   <string name="settings_status_on_summary">Servis pokrenut</string>
-  <string name="settings_provider_title">Pružatelj usluge lokacija</string>
-  <string name="settings_provider_summary">Izvor podataka o lokaciji</string>
-  <string name="settings_provider_gps">GPS pružatelj usluge</string>
-  <string name="settings_provider_network">Mrežni pružatelj usluge</string>
-  <string name="settings_provider_mixed">Mješani pružatelj usluge</string>
+  <string name="settings_accuracy_title">Točnost lokacije</string>
+  <string name="settings_accuracy_high">Visoki</string>
+  <string name="settings_accuracy_medium">Srednji</string>
+  <string name="settings_accuracy_low">Niski</string>
   <string name="settings_foreground_title">Predhodna usluga</string>
   <string name="settings_foreground_summary">Povećanje prioriteta usluge</string>
   <string name="menu_status">Status</string>
@@ -30,10 +31,11 @@
   <string name="about_description">GPS praćenje u stvarnom vremenu za Android uređaje. Kompatibilno sa Traccar Server i drugim sustavima za praćenje.</string>
   <string name="about_license">Ova aplikacija je besplatna i iz otvorenog izvora, izvorni kod je zaštićen Apache Licencom verzija 2.0 i dostupna na GitHub.</string>
   <string name="about_web">Za više informacija posjetite www.traccar.org/client</string>
+  <string name="status_service_create">Servis pokrenut</string>
+  <string name="status_service_destroy">Servis zaustavljen</string>
   <string name="status_send_success">Slanje uspješno</string>
   <string name="status_send_fail">Greška pri slanju</string>
   <string name="status_location_update">Osvežavanje lokacije</string>
-  <string name="status_connectivity_change">Promjena konekcije</string>
   <string name="hidden_app_name">Podešavanje uređaja</string>
   <string name="hidden_alert">Aplikacija je skrivena. Za ponovno otvaranje molim nazovite  8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Molimo unesite ispravnu http:// ili https:// adresu</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Kliens</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Szolgáltatás indítása</string>
+  <string name="shortcut_stop">Szolgáltatás leállítása</string>
+  <string name="shortcut_sos">SOS küldése</string>
+  <string name="channel_default">Elsődleges csatorna</string>
   <string name="settings_id_title">Eszközazonosító</string>
   <string name="settings_url_title">Szerver URL</string>
   <string name="settings_url_summary">Nyomkövető szerver URL</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Megállítás</string>
   <string name="settings_status_off_summary">Szolgáltatás megállítva</string>
   <string name="settings_status_on_summary">Szolgáltatás elindítva</string>
-  <string name="settings_provider_title">Pozíciós szolgáltató</string>
-  <string name="settings_provider_summary">Pozíciós adatok forrása</string>
-  <string name="settings_provider_gps">GPS szolgáltató</string>
-  <string name="settings_provider_network">Hálózati szolgáltató</string>
-  <string name="settings_provider_mixed">Kevert szolgáltató</string>
+  <string name="settings_accuracy_title">Pozíció pontossága</string>
+  <string name="settings_accuracy_summary">Kívánt pozíció pontosság</string>
+  <string name="settings_accuracy_high">Magas</string>
+  <string name="settings_accuracy_medium">Közepes</string>
+  <string name="settings_accuracy_low">Alacsony</string>
   <string name="settings_foreground_title">Előtér szolgáltatás</string>
   <string name="settings_foreground_summary">Szolgáltatás prioritásának emelése</string>
   <string name="menu_status">Státusz</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Valós idejű GPS követő Android eszközökre. Kompatibilis többek közt a Traccar Szerverrel és egyéb követő rendszerekkel is.</string>
   <string name="about_license">Ez az applikáció ingyenes és nyílt forrású, forráskódja az Apache License 2.0 licenccel rendelkezik és elérhető a GitHub-on.</string>
   <string name="about_web">További információkért látogass el az alábbi weboldalra\nwww.traccar.org/client</string>
+  <string name="status_service_create">Szolgáltatás elindítva</string>
+  <string name="status_service_destroy">Szolgáltatás leállítva</string>
   <string name="status_send_success">Küldés sikeres</string>
   <string name="status_send_fail">Küldés sikertelen</string>
   <string name="status_location_update">Pozíció frissítés</string>
-  <string name="status_connectivity_change">Kapcsolódás módosítása</string>
+  <string name="status_network_online">Hálózat aktív</string>
+  <string name="status_network_offline">Hálózat nem aktív</string>
   <string name="hidden_app_name">Eszköz beállítások</string>
   <string name="hidden_alert">Ez az applikáció el lett rejtve. Megnyitásához  kérjük hívja a 8722227 (TRACCAR) telefonszámot.</string>
   <string name="error_msg_invalid_url">Adjon meg egy érvényes URL-t (http:// vagy https://)</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Mulai Layanan</string>
+  <string name="shortcut_stop">Tutup Layanan</string>
+  <string name="shortcut_sos">Kirim SOS</string>
+  <string name="channel_default">Jalur Utama</string>
   <string name="settings_id_title">Pengindentifikasi Perangkat</string>
   <string name="settings_url_title">URL Server</string>
   <string name="settings_url_summary">URL Server Pelacak</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Berhenti</string>
   <string name="settings_status_off_summary">Service Berhenti</string>
   <string name="settings_status_on_summary">Service Aktif</string>
-  <string name="settings_provider_title">Lokasi Penyedia Layanan</string>
-  <string name="settings_provider_summary">Sumber Lokasi Data</string>
-  <string name="settings_provider_gps">Penyedia Layanan GPS</string>
-  <string name="settings_provider_network">Penyedia Layanan Jaringan</string>
-  <string name="settings_provider_mixed">Campuran Penyedia Layanan</string>
+  <string name="settings_accuracy_title">Ketepatan Lokasi</string>
+  <string name="settings_accuracy_summary">Ketepatan Lokasi Yg Dinginkan</string>
+  <string name="settings_accuracy_high">Tinggi</string>
+  <string name="settings_accuracy_medium">Tengah</string>
+  <string name="settings_accuracy_low">Rendah</string>
   <string name="settings_foreground_title">Service Depan</string>
   <string name="settings_foreground_summary">TIngkatkan Prioritas Service</string>
   <string name="menu_status">Status</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Aplikasi GPS Untuk Perangkat Android. Kompatibel Dengan Traccar Server Dan Sistem GPS Lainnya.</string>
   <string name="about_license">Aplikasi Ini Gratis Dan Terbuka, Sumber Kode Berlisensi Dibawah Apache License 2.0 Dan Tersedia di GitHub.</string>
   <string name="about_web">Untuk Informasi Lebih Lanjut Kunjungi www.traccar.org/client</string>
+  <string name="status_service_create">Layanan Dimulai</string>
+  <string name="status_service_destroy">Layanan Berhenti</string>
   <string name="status_send_success">Sukses Terkirim</string>
   <string name="status_send_fail">Gagal Terkirim</string>
   <string name="status_location_update">Lokasi Terbaru</string>
-  <string name="status_connectivity_change">Koneksi Berubah</string>
+  <string name="status_network_online">Jaringan Hidup</string>
+  <string name="status_network_offline">Jaringan Mati</string>
   <string name="hidden_app_name">Pengaturan Perangkat</string>
   <string name="hidden_alert">Aplikasi Telah Tersembunyi. Untuk Membuka Lagi Silahkan Tekan 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Tolong Masukan http:// atau https:// URL Yang Benar</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Avvia servizio</string>
+  <string name="shortcut_stop">Ferma servizio</string>
+  <string name="shortcut_sos">Invia SOS</string>
+  <string name="channel_default">Canale primario</string>
   <string name="settings_id_title">Identificativo dispositivo</string>
   <string name="settings_url_title">Server URL</string>
   <string name="settings_url_summary">Tracking server URL</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Servizio arrestato</string>
   <string name="settings_status_on_summary">Servizio avviato</string>
-  <string name="settings_provider_title">Provider posizione</string>
-  <string name="settings_provider_summary">Fonte dei dati di localizzazione</string>
-  <string name="settings_provider_gps">Provider GPS</string>
-  <string name="settings_provider_network">Provider di rete</string>
-  <string name="settings_provider_mixed">Provider misto</string>
+  <string name="settings_accuracy_title">Accuratezza posizione</string>
+  <string name="settings_accuracy_summary">Precisione desiderata per la posizione</string>
+  <string name="settings_accuracy_high">Alta</string>
+  <string name="settings_accuracy_medium">Media</string>
+  <string name="settings_accuracy_low">Bassa</string>
   <string name="settings_foreground_title">Servizio in primo piano</string>
   <string name="settings_foreground_summary">Aumenta la priorità del servizio</string>
   <string name="menu_status">Stato</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Real time GPS tracker per dispositivi Android. Compatibile con Traccar Server e altri sistemi di tracking.</string>
   <string name="about_license">Questa applicazione è libera e open source, il codice sorgente è sotto licenza Apache License Version 2.0 e disponibile su GitHub.</string>
   <string name="about_web">Per maggiori informazioni visitate \nwww.traccar.org/client</string>
+  <string name="status_service_create">Servizio avviato</string>
+  <string name="status_service_destroy">Servizio fermato</string>
   <string name="status_send_success">Invio riuscito</string>
   <string name="status_send_fail">Invio fallito</string>
   <string name="status_location_update">Aggiornamento posizione</string>
-  <string name="status_connectivity_change">Connessione cambiata</string>
+  <string name="status_network_online">Network online</string>
+  <string name="status_network_offline">Network offline</string>
   <string name="hidden_app_name">Impostazioni dispositivo</string>
   <string name="hidden_alert">La app è stata nascosta. Per aprirla nuovamente digita 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Per favore inserisci un URL valido http:// o https://</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar クライアント</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">サービスを開始</string>
+  <string name="shortcut_stop">サービスを停止</string>
+  <string name="shortcut_sos">SOSを送信</string>
+  <string name="channel_default">プライマリーチャンネル</string>
   <string name="settings_id_title">デバイス ID</string>
   <string name="settings_url_title">サーバー URL</string>
   <string name="settings_url_summary">トラッキングサーバーの URL</string>
@@ -14,27 +18,30 @@
   <string name="settings_status_title">サービスステータス</string>
   <string name="settings_status_off">開始</string>
   <string name="settings_status_on">停止</string>
-  <string name="settings_status_off_summary">サービスは停止しました</string>
-  <string name="settings_status_on_summary">サービスは実行中</string>
-  <string name="settings_provider_title">位置プロバイダー</string>
-  <string name="settings_provider_summary">位置データのソース</string>
-  <string name="settings_provider_gps">GPS プロバイダー</string>
-  <string name="settings_provider_network">ネットワークプロバイダー</string>
-  <string name="settings_provider_mixed">混合プロバイダー</string>
+  <string name="settings_status_off_summary">サービス停止中</string>
+  <string name="settings_status_on_summary">サービス実行中</string>
+  <string name="settings_accuracy_title">位置情報の精度</string>
+  <string name="settings_accuracy_summary">要求される位置情報の精度</string>
+  <string name="settings_accuracy_high">高</string>
+  <string name="settings_accuracy_medium">中</string>
+  <string name="settings_accuracy_low">低</string>
   <string name="settings_foreground_title">フォアグラウンドサービス</string>
   <string name="settings_foreground_summary">サービス優先度を上げる</string>
   <string name="menu_status">ステータス</string>
   <string name="menu_about">アプリについて</string>
   <string name="menu_shortcuts">ショートカットを追加</string>
   <string name="menu_clear">クリア</string>
-  <string name="about_description">Android デバイス用のリアルタイム GPS トラッカー。 Traccar サーバーや他のトラッキングシステムと互換性があります。</string>
+  <string name="about_description">Android デバイス用のリアルタイム GPS トラッカーです。 Traccar サーバーや他のトラッキングシステムと互換性があります。</string>
   <string name="about_license">このアプリケーションは無料のオープンソースで、ソースコードは Apache ライセンス バージョン 2.0 でライセンスされます。 GitHub で利用可能です。</string>
   <string name="about_web">詳細は visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">サービスを開始しました</string>
+  <string name="status_service_destroy">サービスを停止しました</string>
   <string name="status_send_success">送信に成功しました</string>
   <string name="status_send_fail">送信に失敗しました</string>
-  <string name="status_location_update">位置の更新</string>
-  <string name="status_connectivity_change">接続の変更</string>
+  <string name="status_location_update">位置情報更新</string>
+  <string name="status_network_online">ネットワーク　オンライン</string>
+  <string name="status_network_offline">ネットワーク　オフライン</string>
   <string name="hidden_app_name">デバイス設定</string>
   <string name="hidden_alert">アプリは非表示になりました。 もう一度開くには 8722227 (TRACCAR) にダイヤルしてください。</string>
-  <string name="error_msg_invalid_url">正しい http:// または https:// URL を入力してください</string>
+  <string name="error_msg_invalid_url">http:// または https:// から始まるURL を正しく入力してください。</string>
 </resources>

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

@@ -9,11 +9,6 @@
   <string name="settings_status_on">បញ្ឈប់</string>
   <string name="settings_status_off_summary">សេវាឈប់</string>
   <string name="settings_status_on_summary">កំពុងរត់សេវា</string>
-  <string name="settings_provider_title">ក្រុមហ៊ុនផ្ដល់ទីតាំង</string>
-  <string name="settings_provider_summary">ប្រភពនៃទិន្នន័យទីតាំង</string>
-  <string name="settings_provider_gps">អ្នកផ្តល់សេវាប្រព័ន្ធ GPS</string>
-  <string name="settings_provider_network">អ្នកផ្តល់សេវាបណ្តាញ</string>
-  <string name="settings_provider_mixed">ក្រុមហ៊ុនផ្ដល់សេវាជាមួយគ្នា</string>
   <string name="settings_foreground_title">សេវាផ្ទៃខាងមុខ</string>
   <string name="settings_foreground_summary">បង្កើនអាទិភាពសេវា</string>
   <string name="menu_status">ស្ថានភាព</string>
@@ -26,7 +21,6 @@
   <string name="status_send_success">ផ្ញើដោយជោគជ័យ</string>
   <string name="status_send_fail">ការផ្ញើបានបរាជ័យ</string>
   <string name="status_location_update">ធ្វើឱ្យទាន់សម័យទីតាំង</string>
-  <string name="status_connectivity_change">ការផ្លាស់ប្តូរការតភ្ជាប់</string>
   <string name="hidden_app_name">ការកំណត់ឧបករណ៍</string>
   <string name="hidden_alert">កម្មវិធីនេះត្រូវបានលាក់។ ដើម្បីបើកវាម្តងទៀតសូមចុច 8722227 (TRACCAR) ។</string>
 </resources>

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

@@ -9,11 +9,6 @@
   <string name="settings_status_on">중지</string>
   <string name="settings_status_off_summary">서비스중지</string>
   <string name="settings_status_on_summary">서비스실행</string>
-  <string name="settings_provider_title">위치공급자</string>
-  <string name="settings_provider_summary">위치데이타 출처</string>
-  <string name="settings_provider_gps">GPS공급자</string>
-  <string name="settings_provider_network">네트워크공급자</string>
-  <string name="settings_provider_mixed">혼합공급자</string>
   <string name="settings_foreground_title">선처리 서비스</string>
   <string name="settings_foreground_summary">서비스우선순위증가</string>
   <string name="menu_status">상태</string>
@@ -26,7 +21,6 @@
   <string name="status_send_success">보내기 성공</string>
   <string name="status_send_fail">보내기 실패</string>
   <string name="status_location_update">위치 수정</string>
-  <string name="status_connectivity_change">연결 변경</string>
   <string name="hidden_app_name">장치설정</string>
   <string name="hidden_alert">앱이 숨겨져 있습니다. 다시 열려면 8722227 (TRACCAR)로 전화하십시오.</string>
 </resources>

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

@@ -9,11 +9,6 @@
   <string name="settings_status_on">ຢຸດໃຊ້ງານ</string>
   <string name="settings_status_off_summary">ການໃຊ້ງານໄດ້ຢຸດລົງ</string>
   <string name="settings_status_on_summary">ການໃຊ້ງານກຳລັງທຳງານຢູ່</string>
-  <string name="settings_provider_title">ຜູ້ໃຫ້ບໍລິການຈຸດພິກັດ</string>
-  <string name="settings_provider_summary">ແຫລ່ງຂອງຂໍ້ມູນພິກັດ</string>
-  <string name="settings_provider_gps">ຜູ້ໃຫ້ບໍລິການ GPS</string>
-  <string name="settings_provider_network">ຜູ້ໃຫ້ບໍລິການເຄື່ອຄ່າຍ</string>
-  <string name="settings_provider_mixed">ຜູ້ໃຫ້ບໍລິການແບບຮ່ວມກັນ</string>
   <string name="settings_foreground_title">ເຊີວິດໂຟກຣາວດ໌</string>
   <string name="settings_foreground_summary">ເພີ່ມເຊີວິດໄພອໍຣິດຕີ້</string>
   <string name="menu_status">ສະຖານະ</string>
@@ -25,7 +20,6 @@
   <string name="about_web">ຂໍ້ມູນເພີ່ມເຕີມໄດ້ທີ່\nwww.traccar.org/client</string>
   <string name="status_send_fail">ມີຂໍ້ຜິດພາດໃນການສົ່ງຂໍ້ມູນ</string>
   <string name="status_location_update">ສະຖານທີ່ພິກັດໄດ້ອັບເດດ</string>
-  <string name="status_connectivity_change">ການເຊື່ອມຕໍ່ມີການປ່ຽນແປງ</string>
   <string name="hidden_app_name">ການຕັ້ງຄ່າອຸປະກອນ</string>
   <string name="hidden_alert">ແອັບໂຕນີ້ໄດ້ຖືກເຊື່ອງໄວ້. ຖ້າຢາກເປີດຂຶ້ນມາອີກຄັ້ງກະລຸນາກົດໝາຍເລກ 8722227 (TRACCAR).</string>
 </resources>

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

@@ -2,18 +2,29 @@
 <resources>
   <string name="app_name">Traccar programėlė</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Įjungti servisą</string>
+  <string name="shortcut_stop">Sustabdyti servisą</string>
+  <string name="shortcut_sos">Siųsti SOS</string>
+  <string name="channel_default">Pirminis kanalas</string>
   <string name="settings_id_title">Įrenginio numeris</string>
+  <string name="settings_url_title">Serverio URL</string>
+  <string name="settings_url_summary">Sekimo serverio URL</string>
   <string name="settings_interval_title">Dažnumas</string>
+  <string name="settings_interval_summary">Atnaujinimo intervalas sekundėmis</string>
+  <string name="settings_distance_title">Atstumas</string>
+  <string name="settings_distance_summary">Atnaujinimo atstumas metrais</string>
+  <string name="settings_angle_title">Kampas</string>
+  <string name="settings_angle_summary">Atnaujinimo kampas laipsniais</string>
   <string name="settings_status_title">Tarnybos būklė</string>
   <string name="settings_status_off">Pradėti</string>
   <string name="settings_status_on">Stabdyti</string>
   <string name="settings_status_off_summary">Tarnyba sustabdyta</string>
   <string name="settings_status_on_summary">Tarnyba veikia</string>
-  <string name="settings_provider_title">Vietos nustatymas</string>
-  <string name="settings_provider_summary">Vietos nustatymo šaltinis</string>
-  <string name="settings_provider_gps">Įrenginio GPS</string>
-  <string name="settings_provider_network">GSM tinklas</string>
-  <string name="settings_provider_mixed">Mišrus: GSM ir GPS</string>
+  <string name="settings_accuracy_title">Pozicijos tikslumas</string>
+  <string name="settings_accuracy_summary">Norimas pozicijos tikslumas</string>
+  <string name="settings_accuracy_high">Aukštas</string>
+  <string name="settings_accuracy_medium">Vidutinis</string>
+  <string name="settings_accuracy_low">Žemas</string>
   <string name="settings_foreground_title">Žeminti tarnybos prioritetą</string>
   <string name="settings_foreground_summary">Padidinti tarnybos prioritetą</string>
   <string name="menu_status">Būklė</string>
@@ -22,10 +33,15 @@
   <string name="menu_clear">Valyti</string>
   <string name="about_description">GPS sekimo programėlė Android įrenginiams. Suderinta su Traccar Serveriu ir kitomis vietos nustatymo tarnybomis.</string>
   <string name="about_license">Ši programėlė yra nemokama ir atviro kodo. Autorinės teisės yra saugomos pagal Apache Licence Version 2.0 reglamentą (pasiekiama GitHub)</string>
-  <string name="about_web">Daugiau informacijos adresu visit\nwww.traccar.org\client</string>
+  <string name="about_web">Daugiau informacijos rasite adresu \nwww.traccar.org/client</string>
+  <string name="status_service_create">Servisas pradėtas</string>
+  <string name="status_service_destroy">Servisas sustabdytas</string>
+  <string name="status_send_success">Išsiųsta sėkmingai</string>
   <string name="status_send_fail">Klaida siunčiant</string>
   <string name="status_location_update">Vietos nusatymo duomenų atnaujinimas</string>
-  <string name="status_connectivity_change">Prisijungimo duomenų pasikeitimas</string>
+  <string name="status_network_online">Prisijungęs prie tinklo</string>
+  <string name="status_network_offline">Atsijungęs nuo tinklo</string>
   <string name="hidden_app_name">Įrenginio nustatymai</string>
   <string name="hidden_alert">Ši programėlė veikia paslėptu režimu. Norint ją atidaryti, prašau skambinti numeriu 8722227 (TRACCAR)</string>
+  <string name="error_msg_invalid_url">Įveskite tinkamą http:// ar https:// URL</string>
 </resources>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar klients</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Sākt servisu</string>
+  <string name="shortcut_stop">Apstādināt servisu</string>
+  <string name="shortcut_sos">Sūtīt SOS</string>
+  <string name="channel_default">Primārais kanāls</string>
   <string name="settings_id_title">Ierīces identifikators</string>
   <string name="settings_url_title">Servera URL</string>
   <string name="settings_url_summary">Traccar servera URL</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Serviss apturēts</string>
   <string name="settings_status_on_summary">Serviss darbojas</string>
-  <string name="settings_provider_title">Vietas provaiders</string>
-  <string name="settings_provider_summary">Datu atrašanās vietas avots</string>
-  <string name="settings_provider_gps">GPS provaiders</string>
-  <string name="settings_provider_network">Tīkla provaiders</string>
-  <string name="settings_provider_mixed">Miksets provaiders</string>
+  <string name="settings_accuracy_title">Vietas precizitāte</string>
+  <string name="settings_accuracy_summary">Vēlamās vietas precizitāte</string>
+  <string name="settings_accuracy_high">Augsta</string>
+  <string name="settings_accuracy_medium">Vidēja</string>
+  <string name="settings_accuracy_low">Zema</string>
   <string name="settings_foreground_title">Zināšanu servis</string>
   <string name="settings_foreground_summary">Paaugstināt servisa prioritāti</string>
   <string name="menu_status">Statuss</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Reāllaika GPS sekošanas ierīce Android ierīcēm. Savietojams ar Traccar Server un citām izsekošanas sistēmām.</string>
   <string name="about_license">Šī lietotne ir bezmaksas un atvērtā koda, avota kods ir licencēts Apache Licence 2.0 versijā un ir pieejams GitHub.</string>
   <string name="about_web">Lai iegūtu papildinformāciju, apmeklējiet vietni\nwww.traccar.org/client</string>
+  <string name="status_service_create">Serviss uzsākts</string>
+  <string name="status_service_destroy">Serviss apstādināts</string>
   <string name="status_send_success">Sūtīšana veiksmīga</string>
   <string name="status_send_fail">Nosūtīt neizdevās</string>
   <string name="status_location_update">Lokacijas atjaunināšana</string>
-  <string name="status_connectivity_change">Savienojuma maiņa</string>
+  <string name="status_network_online">Tīkls tiešsaitē</string>
+  <string name="status_network_offline">Tīkls bezsaitē</string>
   <string name="hidden_app_name">Ierīces iestatījumi</string>
   <string name="hidden_alert">Lietotne ir paslēpta. Zvaniet 8722227 (TRACCAR), lai to atkal parādītu.</string>
   <string name="error_msg_invalid_url">Lūdzu ievadiet derīgu http:// vai https:// URL</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Start tjeneste</string>
+  <string name="shortcut_stop">Stopp tjeneste</string>
+  <string name="shortcut_sos">Send SOS</string>
+  <string name="channel_default">Primer Kanal</string>
   <string name="settings_id_title">Enhetsidentifikasjon</string>
   <string name="settings_url_title">Tjener-nettadresse</string>
   <string name="settings_url_summary">Sproringstjener-nettadresse</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Stopp</string>
   <string name="settings_status_off_summary">Tjenesten stoppet</string>
   <string name="settings_status_on_summary">Tjenesten kjører</string>
-  <string name="settings_provider_title">Lokaliseringsleverandør</string>
-  <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
-  <string name="settings_provider_gps">GPS-lokalisering</string>
-  <string name="settings_provider_network">Nettverkslokalisering</string>
-  <string name="settings_provider_mixed">Blandet lokalisering</string>
+  <string name="settings_accuracy_title">Posisjonsnøyaktighet</string>
+  <string name="settings_accuracy_summary">Ønsket plasseringsnøyaktighet</string>
+  <string name="settings_accuracy_high">Høy</string>
+  <string name="settings_accuracy_medium">Medium</string>
+  <string name="settings_accuracy_low">Lav</string>
   <string name="settings_foreground_title">Forgrunnen tjeneste</string>
   <string name="settings_foreground_summary">Øk tjeneste-prioritet</string>
   <string name="menu_status">Status</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatibel med Traccar Server og andre sporingssystemer.</string>
   <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengelig på GitHub.</string>
   <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
+  <string name="status_service_create">Tjeneste startet</string>
+  <string name="status_service_destroy">Tjeneste stoppet</string>
   <string name="status_send_success">Sending vellykket</string>
   <string name="status_send_fail">Sending mislyktes</string>
   <string name="status_location_update">Plassering oppdatert</string>
-  <string name="status_connectivity_change">Tilkobling forandret</string>
+  <string name="status_network_online">Nettverk Online</string>
+  <string name="status_network_offline">Nettverk Offline</string>
   <string name="hidden_app_name">Enhetsinnstillinger</string>
   <string name="hidden_alert">App\'en har blitt gjemt. For å åpne igjen, vennligst tast (ring) 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Vennligst skriv korrekt nettadresse som http:// eller https://</string>

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

@@ -2,6 +2,9 @@
 <resources>
   <string name="app_name">Traccar client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Start service</string>
+  <string name="shortcut_stop">Stop service</string>
+  <string name="shortcut_sos">Stuur SOS</string>
   <string name="channel_default">Standaard kanaal</string>
   <string name="settings_id_title">Toestelidentificatie</string>
   <string name="settings_url_title">Server URL</string>
@@ -17,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Service gestopt</string>
   <string name="settings_status_on_summary">Service draait</string>
-  <string name="settings_provider_title">Locatie provider</string>
-  <string name="settings_provider_summary">Bron van locatie data</string>
-  <string name="settings_provider_gps">GPS provider</string>
-  <string name="settings_provider_network">Netwerk provider</string>
-  <string name="settings_provider_mixed">Gecombineerde providers</string>
+  <string name="settings_accuracy_title">Locatienauwkeurigheid</string>
+  <string name="settings_accuracy_summary">Gewenste lokatienauwkeurigheid</string>
+  <string name="settings_accuracy_high">Hoog</string>
+  <string name="settings_accuracy_medium">Gemiddeld</string>
+  <string name="settings_accuracy_low">Laag</string>
   <string name="settings_foreground_title">Voorgrond service</string>
   <string name="settings_foreground_summary">Verhoog voorrang voor service</string>
   <string name="menu_status">Status</string>
@@ -31,10 +34,13 @@
   <string name="about_description">Real time GPS tracker voor Android apparaten. Compatibel met de Traccar server en andere tracking systemen.</string>
   <string name="about_license">Deze toepassing is gratis en open source, de broncode is beschikbaar onder de Apache Licentie versie 2.0 op GitHub.</string>
   <string name="about_web">Voor meer informatie bezoek\nwww.traccar.org/client</string>
+  <string name="status_service_create">Service gestart</string>
+  <string name="status_service_destroy">Service gestopt</string>
   <string name="status_send_success">Succesvol verstuurd</string>
   <string name="status_send_fail">Verzenden mislukt</string>
   <string name="status_location_update">Locatie update</string>
-  <string name="status_connectivity_change">Verbinding gewijzigd</string>
+  <string name="status_network_online">Netwerk online</string>
+  <string name="status_network_offline">Netwerk offline</string>
   <string name="hidden_app_name">Toestel instellingen</string>
   <string name="hidden_alert">De app is verborgen. Om hem opnieuw te openen bel je naar 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Voer alstublieft een geldige http:// of https:// URL in</string>

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

@@ -2,7 +2,13 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Start teneste</string>
+  <string name="shortcut_stop">Stopp teneste</string>
+  <string name="shortcut_sos">Send SOS</string>
+  <string name="channel_default">Hovud kanal</string>
   <string name="settings_id_title">Einingsidentifikator</string>
+  <string name="settings_url_title">Tenar-URL</string>
+  <string name="settings_url_summary">Sporingstenar-URL</string>
   <string name="settings_interval_title">Frekvens</string>
   <string name="settings_interval_summary">Rapporteringsinterval i sekundar</string>
   <string name="settings_distance_title">Avstand</string>
@@ -14,11 +20,11 @@
   <string name="settings_status_on">Stopp</string>
   <string name="settings_status_off_summary">Teneste stoppa</string>
   <string name="settings_status_on_summary">Tenar køyrer</string>
-  <string name="settings_provider_title">Lokaliseringsleverandør</string>
-  <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
-  <string name="settings_provider_gps">GPS-lokalisering</string>
-  <string name="settings_provider_network">Nettverkslokalisering</string>
-  <string name="settings_provider_mixed">Blanda lokalisering</string>
+  <string name="settings_accuracy_title">Lokasjonsnøyaktighet</string>
+  <string name="settings_accuracy_summary">Ønska lokasjonsnøyaktighet</string>
+  <string name="settings_accuracy_high">Høg</string>
+  <string name="settings_accuracy_medium">Medium</string>
+  <string name="settings_accuracy_low">Lav</string>
   <string name="settings_foreground_title">Forgrunnsteneste</string>
   <string name="settings_foreground_summary">Auk teneste-prioritet</string>
   <string name="menu_status">Status</string>
@@ -28,10 +34,14 @@
   <string name="about_description">Sanntids GPS-sporing for Android-einingar. Kompatibel med Traccar Server og andre sporingssystem</string>
   <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengeleg på GitHub.</string>
   <string name="about_web">For meir informasjon besøk\nwww.traccar.org/client</string>
+  <string name="status_service_create">Teneste starta</string>
+  <string name="status_service_destroy">Teneste stoppa</string>
   <string name="status_send_success">Send vellukka</string>
   <string name="status_send_fail">Sending feila</string>
   <string name="status_location_update">Plassering oppdatert</string>
-  <string name="status_connectivity_change">Tilkopling forandra</string>
+  <string name="status_network_online">Nettverk tilkopla</string>
+  <string name="status_network_offline">Nettverk fråkopla</string>
   <string name="hidden_app_name">Einingsinnstillingar</string>
   <string name="hidden_alert">App\'en har blitt gøymt. For å åpne han igjen, ver venleg å tast (ring) 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">Ver venleg å taste gyldig http:// eller https:// URL</string>
 </resources>

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

@@ -1,7 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Klient Traccar</string>
+  <string name="app_name">Traccar Klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Start usługi</string>
+  <string name="shortcut_stop">Zatrzymanie usługi</string>
+  <string name="shortcut_sos">Wyślij SOS</string>
+  <string name="channel_default">Podstawowy kanał</string>
   <string name="settings_id_title">Identyfikator urządzenia</string>
   <string name="settings_url_title">URL Serwera</string>
   <string name="settings_url_summary">URL serwera śledzącego</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Zatrzymaj</string>
   <string name="settings_status_off_summary">Usługa zatrzymana</string>
   <string name="settings_status_on_summary">Usługa uruchomiona</string>
-  <string name="settings_provider_title">Dostawca lokalizacji</string>
-  <string name="settings_provider_summary">Źródło danych o lokalizacji</string>
-  <string name="settings_provider_gps">GPS</string>
-  <string name="settings_provider_network">Sieć</string>
-  <string name="settings_provider_mixed">Mieszane</string>
+  <string name="settings_accuracy_title">Dokładność lokalizacji</string>
+  <string name="settings_accuracy_summary">Żądana dokładność lokalizacji</string>
+  <string name="settings_accuracy_high">Wysoka</string>
+  <string name="settings_accuracy_medium">Średnia</string>
+  <string name="settings_accuracy_low">Niska</string>
   <string name="settings_foreground_title">Usługa pierwszoplanowa</string>
   <string name="settings_foreground_summary">Zwiększ priorytet usługi</string>
   <string name="menu_status">Status</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Monitor GPS dla urządzeń Android. Kompatybilny z serwerem Traccar oraz innymi platformami śledzącymi.</string>
   <string name="about_license">Ta aplikacja jest darmowa i otwartoźródłowa. Kod źródłowy jest licencjonowany Apache License Version 2.0 i jest dostępny na GitHub.</string>
   <string name="about_web">Więcej informacji - odwiedź\nwww.traccar.org/client</string>
+  <string name="status_service_create">Usługa wystartowana</string>
+  <string name="status_service_destroy">Usługa zatrzymana</string>
   <string name="status_send_success">Wysłane poprawnie</string>
   <string name="status_send_fail">Wysłanie nieudane</string>
   <string name="status_location_update">Aktualizacja lokalizacji</string>
-  <string name="status_connectivity_change">Zmiana połączenia</string>
+  <string name="status_network_online">Połączony z siecią</string>
+  <string name="status_network_offline">Rozłączony z siecią</string>
   <string name="hidden_app_name">Ustawienia urządzenia</string>
   <string name="hidden_alert">Aplikacja została ukryta. By ją otworzyć, zadzwoń pod 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Wprowadź poprawny adres http:// lub https:// URL</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -2,7 +2,11 @@
 <resources>
   <string name="app_name">Cliente Traccar</string>
   <string name="app_logo">Traccar</string>
-  <string name="settings_id_title">Identificador único</string>
+  <string name="shortcut_start">Iniciar serviço</string>
+  <string name="shortcut_stop">Parar serviço</string>
+  <string name="shortcut_sos">Enviar SOS</string>
+  <string name="channel_default">Canal Principal</string>
+  <string name="settings_id_title">Identificador do dispositivo</string>
   <string name="settings_url_title">URL do Servidor</string>
   <string name="settings_url_summary">URL do servidor de rastreamento</string>
   <string name="settings_interval_title">Invervalo</string>
@@ -16,24 +20,27 @@
   <string name="settings_status_on">Parar</string>
   <string name="settings_status_off_summary">Serviço Parado</string>
   <string name="settings_status_on_summary">Serviço em execução</string>
-  <string name="settings_provider_title">Provedor de localização</string>
-  <string name="settings_provider_summary">Fonte dos dados de localização</string>
-  <string name="settings_provider_gps">Provedor GPS</string>
-  <string name="settings_provider_network">Provedor Rede</string>
-  <string name="settings_provider_mixed">Provedor Misto</string>
-  <string name="settings_foreground_title">Serviço primeiro plano</string>
+  <string name="settings_accuracy_title">Precisão de localização</string>
+  <string name="settings_accuracy_summary">Precisão de localização desejada</string>
+  <string name="settings_accuracy_high">Alto</string>
+  <string name="settings_accuracy_medium">Médio</string>
+  <string name="settings_accuracy_low">Baixo</string>
+  <string name="settings_foreground_title">Serviço em primeiro plano</string>
   <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
   <string name="menu_status">Status</string>
   <string name="menu_about">Sobre</string>
   <string name="menu_shortcuts">Adicionar atalhos</string>
   <string name="menu_clear">Limpar</string>
-  <string name="about_description">Rastreador GPS Real Time para dispositivos Android. Compatível com servidor Traccar e outros sistemas de rastreamento.</string>
+  <string name="about_description">Rastreador GPS em tempo real para dispositivos Android. Compatível com o Traccar Server e outros sistemas de rastreamento.</string>
   <string name="about_license">Esta aplicação é livre e de código aberto, o código fonte é licenciado sob a licença Apache Versão 2.0 e disponível no GitHub.</string>
   <string name="about_web">Para mais informações visite\nwww.traccar.org/client</string>
+  <string name="status_service_create">Serviço iniciado</string>
+  <string name="status_service_destroy">Serviço parado</string>
   <string name="status_send_success">Enviado com Sucesso</string>
   <string name="status_send_fail">Falha no envio</string>
   <string name="status_location_update">Localização atualizada</string>
-  <string name="status_connectivity_change">Mudança de conectividade</string>
+  <string name="status_network_online">Rede online</string>
+  <string name="status_network_offline">Rede offline</string>
   <string name="hidden_app_name">Configurações do Dispositivo</string>
   <string name="hidden_alert">O aplicativo foi escondido. Para abrir novamente por favor digite 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Digite um URL http: // ou https: // válido</string>

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

@@ -2,18 +2,29 @@
 <resources>
   <string name="app_name">Cliente Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Iniciar serviço</string>
+  <string name="shortcut_stop">Parar serviço</string>
+  <string name="shortcut_sos">Enviar SOS</string>
+  <string name="channel_default">Canal Principal</string>
   <string name="settings_id_title">Identificador único</string>
+  <string name="settings_url_title">URL do Servidor</string>
+  <string name="settings_url_summary">URL do servidor de rastreamento</string>
   <string name="settings_interval_title">Invervalo</string>
+  <string name="settings_interval_summary">Intervalo de relatórios em segundos</string>
+  <string name="settings_distance_title">Distância</string>
+  <string name="settings_distance_summary">Distância de relatórios em metros</string>
+  <string name="settings_angle_title">Ângulo</string>
+  <string name="settings_angle_summary">Ângulo de relatório em graus</string>
   <string name="settings_status_title">Status do Serviço</string>
   <string name="settings_status_off">Iniciar</string>
   <string name="settings_status_on">Parar</string>
   <string name="settings_status_off_summary">Serviço Parado</string>
   <string name="settings_status_on_summary">Serviço em execução</string>
-  <string name="settings_provider_title">Provedor de localização</string>
-  <string name="settings_provider_summary">Fonte dos dados de localização</string>
-  <string name="settings_provider_gps">Provedor GPS</string>
-  <string name="settings_provider_network">Provedor Rede</string>
-  <string name="settings_provider_mixed">Provedor Misto</string>
+  <string name="settings_accuracy_title">Precisão de localização</string>
+  <string name="settings_accuracy_summary">Precisão de localização desejada</string>
+  <string name="settings_accuracy_high">Alto</string>
+  <string name="settings_accuracy_medium">Médio</string>
+  <string name="settings_accuracy_low">Baixo</string>
   <string name="settings_foreground_title">Serviço primeiro plano</string>
   <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
   <string name="menu_status">Estado</string>
@@ -23,10 +34,14 @@
   <string name="about_description">Localizador GPS em tempo real para dispositivos Android. Compatível com servidor Traccar e outros sistemas de localização.</string>
   <string name="about_license">Esta aplicação é livre e de código aberto, o código fonte é licenciado sob a licença Apache Versão 2.0 e disponível no GitHub.</string>
   <string name="about_web">Para mais informações visite \nwww.traccar.org/client</string>
+  <string name="status_service_create">Serviço Iniciado</string>
+  <string name="status_service_destroy">Serviço Parado</string>
   <string name="status_send_success">Enviado com Sucesso</string>
   <string name="status_send_fail">Falha no envio</string>
   <string name="status_location_update">Localização atualizada</string>
-  <string name="status_connectivity_change">Mudança de conectividade</string>
+  <string name="status_network_online">Rede online</string>
+  <string name="status_network_offline">Rede offline</string>
   <string name="hidden_app_name">Definições do Dispositivo</string>
   <string name="hidden_alert">A aplicação foi ocultada com sucesso. Para abrir novamente, por favor contacte 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">Digite um URL http: // ou https: // válido</string>
 </resources>

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

@@ -16,11 +16,6 @@
   <string name="settings_status_on">Oprit</string>
   <string name="settings_status_off_summary">Serviciu Oprit</string>
   <string name="settings_status_on_summary">Serviciul rulează</string>
-  <string name="settings_provider_title">Furnizor locaţie</string>
-  <string name="settings_provider_summary">Sursă date localizare</string>
-  <string name="settings_provider_gps">Furnizor GPS</string>
-  <string name="settings_provider_network">Furnizor Reţea</string>
-  <string name="settings_provider_mixed">Furnizor Mixt</string>
   <string name="settings_foreground_title">Serviciul prim-plan</string>
   <string name="settings_foreground_summary">Creştere prioritate serviciu</string>
   <string name="menu_status">Stare</string>
@@ -33,7 +28,6 @@
   <string name="status_send_success">Expediat</string>
   <string name="status_send_fail">Trimitere eşuată</string>
   <string name="status_location_update">Actualizare locaţie</string>
-  <string name="status_connectivity_change">Schimbare conectivitate</string>
   <string name="hidden_app_name">Setări Dispozitiv</string>
   <string name="hidden_alert">Aplicaţia este ascunsă. Pentru deschidere vă rugam apelaţi numărul de telefon 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Introduceti o adresa valida http:// sau https://</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Клиент</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Запуск сервиса</string>
+  <string name="shortcut_stop">Остановка сервиса</string>
+  <string name="shortcut_sos">Отправка SOS</string>
+  <string name="channel_default">Первичный канал</string>
   <string name="settings_id_title">Идентификатор устройства</string>
   <string name="settings_url_title">URL сервера</string>
   <string name="settings_url_summary">URL телематического сервера</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Стоп</string>
   <string name="settings_status_off_summary">Сервис остановлен</string>
   <string name="settings_status_on_summary">Сервис запущен</string>
-  <string name="settings_provider_title">Провайдер местоположения</string>
-  <string name="settings_provider_summary">Источник данных о местоположении</string>
-  <string name="settings_provider_gps">GPS провайдер</string>
-  <string name="settings_provider_network">Сетевой провайдер</string>
-  <string name="settings_provider_mixed">Смешанный провайдер</string>
+  <string name="settings_accuracy_title">Точность местоположения</string>
+  <string name="settings_accuracy_summary">Точность местоположения</string>
+  <string name="settings_accuracy_high">Высокая</string>
+  <string name="settings_accuracy_medium">Средняя</string>
+  <string name="settings_accuracy_low">Низкая</string>
   <string name="settings_foreground_title">Приоритетный сервис</string>
   <string name="settings_foreground_summary">Увеличить приоритет сервиса</string>
   <string name="menu_status">Состояние</string>
@@ -30,11 +34,14 @@
   <string name="about_description">Трекер для Android устройств. Совместим с Traccar сервером и другими мониторинговыми системами.</string>
   <string name="about_license">Это приложение распростаняется бесплатно, исходный код распростаняется по лицензии Apache License Version 2.0 и доступен на GitHub.</string>
   <string name="about_web">Для получения дополнительной информации посетите\nwww.traccar.org/client</string>
+  <string name="status_service_create">Сервис запущен</string>
+  <string name="status_service_destroy">Сервис остановлен</string>
   <string name="status_send_success">Отправка успешна</string>
   <string name="status_send_fail">Ошибка отправки</string>
   <string name="status_location_update">Обновление местоположения</string>
-  <string name="status_connectivity_change">Изменение подключения</string>
-  <string name="hidden_app_name">Настройки устройтва</string>
+  <string name="status_network_online">Сеть онлайн</string>
+  <string name="status_network_offline">Сеть оффлайн</string>
+  <string name="hidden_app_name">Настройки устройства</string>
   <string name="hidden_alert">Приложение было спрятано. Чтобы открыть позвоните на номер 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Пожалуйста, введите верный http:// или https:// URL</string>
 </resources>

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

@@ -9,11 +9,6 @@
   <string name="settings_status_on">නැවතීම</string>
   <string name="settings_status_off_summary">සේවාව අක්‍රීයයි</string>
   <string name="settings_status_on_summary">සේවාව ක්‍රියාත්මකයි</string>
-  <string name="settings_provider_title">Location provider</string>
-  <string name="settings_provider_summary">Source of location data</string>
-  <string name="settings_provider_gps">GPS provider</string>
-  <string name="settings_provider_network">Network provider</string>
-  <string name="settings_provider_mixed">Mixed provider</string>
   <string name="settings_foreground_title">Foreground service</string>
   <string name="settings_foreground_summary">Increase service priority</string>
   <string name="menu_status">තත්වය</string>
@@ -25,6 +20,5 @@
   <string name="about_web">For more information visit\nwww.traccar.org/client</string>
   <string name="status_send_fail">යැවිය නොහැකිය</string>
   <string name="status_location_update">Location update</string>
-  <string name="status_connectivity_change">Connectivity change</string>
   <string name="hidden_app_name">උපකරණ සැකසුම්</string>
 </resources>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Manager</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Spustiť službu</string>
+  <string name="shortcut_stop">Zastaviť službu</string>
+  <string name="shortcut_sos">Poslať SOS</string>
+  <string name="channel_default">Primárny kanál</string>
   <string name="settings_id_title">Identifikátor zariadenia</string>
   <string name="settings_url_title">URL server</string>
   <string name="settings_url_summary">Sledovanie URL serveru</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Služba sa zastavila</string>
   <string name="settings_status_on_summary">Služba beží</string>
-  <string name="settings_provider_title">Poskytovateľ polohy</string>
-  <string name="settings_provider_summary">Zdroj polohovacích údajov</string>
-  <string name="settings_provider_gps">Poskytovateľ GPS</string>
-  <string name="settings_provider_network">Poskytovateľ sieťových služieb</string>
-  <string name="settings_provider_mixed">Mix poskytovateľ </string>
+  <string name="settings_accuracy_title">Presnosť lokalizácie</string>
+  <string name="settings_accuracy_summary">Požadovaná presnosť lokalizácie</string>
+  <string name="settings_accuracy_high">Vysoká</string>
+  <string name="settings_accuracy_medium">Stredná</string>
+  <string name="settings_accuracy_low">Nízka</string>
   <string name="settings_foreground_title">Služba v popredí</string>
   <string name="settings_foreground_summary">Zvýšiť prioritu servis</string>
   <string name="menu_status">Status</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Real time GPS tracker pre Android zariadenia. Kompatibilný s Traccar Serverom a ďalšími sledovacími systémami.</string>
   <string name="about_license">Táto aplikácia je zadarmo a open source, zdrojový kód pod licenciou Apache License verzie 2.0 a je k dispozícii na GitHub.</string>
   <string name="about_web">Pre viac informácií navštívte visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">Služba spustená</string>
+  <string name="status_service_destroy">Služba zastavená</string>
   <string name="status_send_success">Úspešne poslané</string>
   <string name="status_send_fail">Odoslanie zlyhalo</string>
   <string name="status_location_update">Aktualizácia polohy</string>
-  <string name="status_connectivity_change">Zmena konektivity</string>
+  <string name="status_network_online">Sieť online</string>
+  <string name="status_network_offline">Sieť offline</string>
   <string name="hidden_app_name">Nastavenie zariadenia</string>
   <string name="hidden_alert">Aplikácia bola skrytá. Pre opätovné otvorenie znova vytočte 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Prosím zadajte validné http:// alebo https:// URL</string>

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

@@ -2,13 +2,46 @@
 <resources>
   <string name="app_name">Traccar klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Zaženi storitev</string>
+  <string name="shortcut_stop">Ustavi storitev</string>
+  <string name="shortcut_sos">Pošlji SOS</string>
+  <string name="channel_default">Glavni kanal</string>
+  <string name="settings_id_title">Identifikator naprave</string>
+  <string name="settings_url_title">URL strežnika</string>
+  <string name="settings_url_summary">ULR naslov strežnika za sledenje</string>
+  <string name="settings_interval_title">Frekvenca</string>
+  <string name="settings_interval_summary">Pogostost pošiljanja v sekundah</string>
+  <string name="settings_distance_title">Razdalja</string>
+  <string name="settings_distance_summary">Razdalja med pošiljanji v metrih</string>
+  <string name="settings_angle_title">Kot</string>
+  <string name="settings_angle_summary">Kot med pošiljanji v stopinjah</string>
+  <string name="settings_status_title">Stanje storitve</string>
   <string name="settings_status_off">Zaženi</string>
   <string name="settings_status_on">Ustavi</string>
-  <string name="settings_status_off_summary">Servis ustavljen</string>
-  <string name="settings_status_on_summary">Servis teče</string>
+  <string name="settings_status_off_summary">Storitev ustavljena</string>
+  <string name="settings_status_on_summary">Storitev zagnana</string>
+  <string name="settings_accuracy_title">Natančnost lokacije</string>
+  <string name="settings_accuracy_summary">Željena natančnost lokacije</string>
+  <string name="settings_accuracy_high">Visoka</string>
+  <string name="settings_accuracy_medium">Srednja</string>
+  <string name="settings_accuracy_low">Nizka</string>
+  <string name="settings_foreground_title">Storitev v ospredju</string>
+  <string name="settings_foreground_summary">Povečaj prioriteto storitve</string>
   <string name="menu_status">Stanje</string>
+  <string name="menu_about">O programu</string>
+  <string name="menu_shortcuts">Dodaj bližnjice</string>
   <string name="menu_clear">Počisti</string>
+  <string name="about_description">GPS sledilnik v realnem času za naprave Android. Kompatibilno s strežnikom Traccar in drugimi sledilnimi sistemi.</string>
+  <string name="about_license">Ta aplikacija je zastonj in odprtokodna. Izvorna koda je objavljena na GitHub-u z dovoljenjem Apache License verzije 2.0</string>
+  <string name="about_web">Za več informacij obiščite\nwww.traccar.org/client</string>
+  <string name="status_service_create">Storitev zagnana</string>
+  <string name="status_service_destroy">Storitev ustavljena</string>
   <string name="status_send_success">Pošiljanje uspelo</string>
   <string name="status_send_fail">Pošiljanje spodletelo</string>
+  <string name="status_location_update">Posodobitev lokacije</string>
+  <string name="status_network_online">Mrežna povezava vzpostavljena</string>
+  <string name="status_network_offline">Ni mrežne povezave</string>
   <string name="hidden_app_name">Nastavitve naprave</string>
+  <string name="hidden_alert">Aplikacija je bila skrita. Za njen ponoven prikaz pokličite telefonsko številko 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">Prosim vpišite veljaven http:// ali https:// naslov</string>
 </resources>

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

@@ -20,11 +20,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Servis zaustavljen</string>
   <string name="settings_status_on_summary">Servis pokrenut</string>
-  <string name="settings_provider_title">Provajder lokacije</string>
-  <string name="settings_provider_summary">Izvor lokacijskih podataka</string>
-  <string name="settings_provider_gps">GPS provajder</string>
-  <string name="settings_provider_network">Provajder Mreže</string>
-  <string name="settings_provider_mixed">Oba zajedno provajdera</string>
+  <string name="settings_accuracy_title">Tačnost lokacije</string>
+  <string name="settings_accuracy_summary">Željena tačnost lokacije</string>
+  <string name="settings_accuracy_high">Visoka</string>
+  <string name="settings_accuracy_medium">Srednja</string>
+  <string name="settings_accuracy_low">Mala</string>
   <string name="settings_foreground_title">Prvi plan servis</string>
   <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
   <string name="menu_status">Status</string>
@@ -36,10 +36,11 @@
   <string name="about_web">Za više informacija www.traccar.org/client </string>
   <string name="status_service_create">Servis pokrenut</string>
   <string name="status_service_destroy">Servis zaustavljen</string>
-  <string name="status_send_success">Slanne uspešno</string>
+  <string name="status_send_success">Slanje uspešno</string>
   <string name="status_send_fail">Slanje neuspešno</string>
   <string name="status_location_update">Ažuriranje lokacije</string>
-  <string name="status_connectivity_change">Promenjena konekcija</string>
+  <string name="status_network_online">Mreža dostupna</string>
+  <string name="status_network_offline">Mreža nedostupna</string>
   <string name="hidden_app_name">Podešavanja uređaja</string>
   <string name="hidden_alert">Aplikacija je skrivena. Da je otvorite kucajte 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Molimo unesite pravilnu http:// ili https:// adresu</string>

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

@@ -14,11 +14,6 @@
   <string name="settings_status_on">நிறுத்து</string>
   <string name="settings_status_off_summary">சேவை நிறுத்தப்பட்டது</string>
   <string name="settings_status_on_summary">சேவை இயங்குகிறது</string>
-  <string name="settings_provider_title">இடம் வழங்குநர்</string>
-  <string name="settings_provider_summary">மூல இடத்தரவு</string>
-  <string name="settings_provider_gps">நேரடி பூகோள இடம்காடி வழங்குநர்</string>
-  <string name="settings_provider_network">பிணையம் வழங்குநர்</string>
-  <string name="settings_provider_mixed">கலப்பு வழங்குநர்</string>
   <string name="settings_foreground_title">பின்னணி சேவை</string>
   <string name="settings_foreground_summary">சேவை முன்னுரிமை அதிகரிக்க</string>
   <string name="menu_status">நிலை</string>
@@ -30,7 +25,6 @@
   <string name="about_web">மேலும் தகவல்களுக்கு அணுகவும் www.traccar.org/client</string>
   <string name="status_send_fail">தகவல் அனுப்புதல் தோல்வியுற்றது</string>
   <string name="status_location_update">இடம் மேம்படுத்தல்</string>
-  <string name="status_connectivity_change">இணைப்பு மாற்றம்</string>
   <string name="hidden_app_name">சாதன அமைப்புகள்</string>
   <string name="hidden_alert">செயலி மறைக்கப்பட்டுள்ளது. அதை காண பின்வரும் எண்ணை அழைக்கவும் 8722227 ( ட்ரக்கர் )</string>
 </resources>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">เริ่มต้นบริการ</string>
+  <string name="shortcut_stop">หยุดบริการ</string>
+  <string name="shortcut_sos">ส่ง SOS</string>
+  <string name="channel_default">ช่องหลัก</string>
   <string name="settings_id_title">หมายเลขอุปกรณ์</string>
   <string name="settings_url_title">ท๊่อยู่ URL เซิร์ฟเวอร์</string>
   <string name="settings_url_summary">ท๊่อยู่ URL เซิร์ฟเวอร์ติดตาม</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">สิ้นสุด</string>
   <string name="settings_status_off_summary">เริ่มทำงาน</string>
   <string name="settings_status_on_summary">หยุดทำงาน</string>
-  <string name="settings_provider_title">ตัวบอกตำแหน่ง</string>
-  <string name="settings_provider_summary">แหล่งของข้อมูลบอกตำแหน่ง</string>
-  <string name="settings_provider_gps">ใช้จาก GPS</string>
-  <string name="settings_provider_network">ใช้จากข้อมูลเครือข่าย</string>
-  <string name="settings_provider_mixed">ใช้ร่วมกันทั้งสองแบบ</string>
+  <string name="settings_accuracy_title">ตำแหน่ง-ความแม่นยำ</string>
+  <string name="settings_accuracy_summary">ตำแหน่ง-ต้องการความแม่นยำ</string>
+  <string name="settings_accuracy_high">สูงมาก</string>
+  <string name="settings_accuracy_medium">ปานกลาง</string>
+  <string name="settings_accuracy_low">ต่ำ</string>
   <string name="settings_foreground_title">ทำงานเบื้องหน้า</string>
   <string name="settings_foreground_summary">เพิ่มความลำดับสำคัญการทำงาน</string>
   <string name="menu_status">สถานะ</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
   <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
   <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">บริการเริ่มต้นแล้ว</string>
+  <string name="status_service_destroy">หยุดให้บริการแล้ว</string>
   <string name="status_send_success">ส่งข้อมูลเรียบร้อย</string>
   <string name="status_send_fail">ส่งข้อมูลล้มเหลว</string>
   <string name="status_location_update">ปรับปรุงตำแหน่ง</string>
-  <string name="status_connectivity_change">เปลี่ยนแปลงการเชื่อมต่อ</string>
+  <string name="status_network_online">เน็ต-ออนไลน์</string>
+  <string name="status_network_offline">เน็ต-ออฟไลน์</string>
   <string name="hidden_app_name">ตั้งค่าอุปกรณ์</string>
   <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">โปรดใส่ค่า http:// or https:// URL ที่ถูกต้อง</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Traccar Yönetim</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Servisi Başlat</string>
+  <string name="shortcut_stop">Servisi Durdur</string>
+  <string name="shortcut_sos">Yardım Çağrısı Gönder</string>
+  <string name="channel_default">Birincil Kanal</string>
   <string name="settings_id_title">Cihaz Kimliği</string>
   <string name="settings_url_title">Sunucu adresi</string>
   <string name="settings_url_summary">Takip sunucusu adresi</string>
@@ -16,11 +20,11 @@
   <string name="settings_status_on">Durdur</string>
   <string name="settings_status_off_summary">Servis Durdu</string>
   <string name="settings_status_on_summary">Servis Çalışıyor</string>
-  <string name="settings_provider_title">Yer sağlayıcı</string>
-  <string name="settings_provider_summary">Yer bilgisi kaynağı</string>
-  <string name="settings_provider_gps">GPS sağlayıcı</string>
-  <string name="settings_provider_network">Network sağlayıcı</string>
-  <string name="settings_provider_mixed">Karışık sağlayıcı</string>
+  <string name="settings_accuracy_title">Yer Doğruluğu</string>
+  <string name="settings_accuracy_summary">İstenilen Yer Doğruluğu</string>
+  <string name="settings_accuracy_high">Yüksek</string>
+  <string name="settings_accuracy_medium">Orta</string>
+  <string name="settings_accuracy_low">Alçak</string>
   <string name="settings_foreground_title">Önplan servisi</string>
   <string name="settings_foreground_summary">Servis önceliği arttır</string>
   <string name="menu_status">Durum</string>
@@ -30,10 +34,13 @@
   <string name="about_description">Android cihazlar için gerçek zamanlı takip uygulaması. Traccar sunucuları ve diğer takip sistemleriyle uyumlu.</string>
   <string name="about_license">Bu uygulama ücretsiz ve acık kaynaklıdır , kaynak kodu lisansı Apache License Version 2.0 altında lisanslı ve GitHub üzerinden ulaşılabilir.</string>
   <string name="about_web">Daha fazla bilgi için http:\\www.traccar.org/client adresini ziyaret edin.</string>
+  <string name="status_service_create">Servis Başlatıldı</string>
+  <string name="status_service_destroy">Servis Durduruldu</string>
   <string name="status_send_success">Gönderme başarılı</string>
   <string name="status_send_fail">Gönderme başarısız</string>
   <string name="status_location_update">Yer güncellendi</string>
-  <string name="status_connectivity_change">Bağlantı değişimi</string>
+  <string name="status_network_online">Ağa Bağlandı</string>
+  <string name="status_network_offline">Ağ Bağlantısı Kesildi</string>
   <string name="hidden_app_name">Cihaz Ayarları</string>
   <string name="hidden_alert">Bu uygulama arkaplanda gizli olarak çalışmaktadır. Tekrar görmek için lütfen 8722227 tuşlayın. Arayın. (TRACCAR)</string>
   <string name="error_msg_invalid_url">Lütfen geçerli bir adres girin http:// veya https://</string>

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

@@ -9,11 +9,6 @@
   <string name="settings_status_on">Стоп</string>
   <string name="settings_status_off_summary">Сервіс зупинений</string>
   <string name="settings_status_on_summary">Сервіс працює</string>
-  <string name="settings_provider_title">Місцезнаходження провайдера</string>
-  <string name="settings_provider_summary">Джерело місцезнаходження</string>
-  <string name="settings_provider_gps">Дані GPS</string>
-  <string name="settings_provider_network">Дані мережі провайдера</string>
-  <string name="settings_provider_mixed">Змішані дані</string>
   <string name="settings_foreground_title">Служба переднього плану</string>
   <string name="settings_foreground_summary">Збільшення пріоритету обслуговування</string>
   <string name="menu_status">Статус</string>
@@ -26,7 +21,6 @@
   <string name="status_send_success">Успішно відправлено</string>
   <string name="status_send_fail">Відправлення  невдале</string>
   <string name="status_location_update">Оновлення розташування</string>
-  <string name="status_connectivity_change">Зміна підключення</string>
   <string name="hidden_app_name">Налаштування пристрою</string>
   <string name="hidden_alert">Додаток було приховано. Щоб відкрити його знову наберіть 8722227 (TRACCAR).</string>
 </resources>

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

@@ -16,11 +16,6 @@
   <string name="settings_status_on">Kết thúc</string>
   <string name="settings_status_off_summary">Dịch vụ kết thúc</string>
   <string name="settings_status_on_summary">Dịch vụ đang hoạt động</string>
-  <string name="settings_provider_title">Định vị</string>
-  <string name="settings_provider_summary">Nguồn dữ liệu vị trí</string>
-  <string name="settings_provider_gps">Thiết bị GPS</string>
-  <string name="settings_provider_network">Nhà cung cấp mạng</string>
-  <string name="settings_provider_mixed">Nhà cung cấp tổng hợp</string>
   <string name="settings_foreground_title">Dịch vụ chạy nổi</string>
   <string name="settings_foreground_summary">Tăng thứ tự ưu tiên dịch vụ</string>
   <string name="menu_status">Trạng thái</string>
@@ -33,7 +28,6 @@
   <string name="status_send_success">Gửi thành công</string>
   <string name="status_send_fail">Gửi lỗi</string>
   <string name="status_location_update">Vị trí đã được cập nhật</string>
-  <string name="status_connectivity_change">Kết nối thay đổi</string>
   <string name="hidden_app_name">Cài đặt thiết bị</string>
   <string name="hidden_alert">Ứng dụng đã được ẩn. Để mở lại xin vui lòng gọi 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Vui lòng nhập đường dẫn hợp lệ http:// hoặc https://</string>

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

@@ -1,39 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Traccar客户端</string>
+  <string name="app_name">Traccar定位端</string>
   <string name="app_logo">Traccar</string>
-  <string name="settings_id_title">设备标识符</string>
-  <string name="settings_url_title">服务地址</string>
+  <string name="shortcut_start">开始服务</string>
+  <string name="shortcut_stop">停止服务</string>
+  <string name="shortcut_sos">发送SOS</string>
+  <string name="channel_default">主通道</string>
+  <string name="settings_id_title">设备编码</string>
+  <string name="settings_url_title">服务器地址</string>
   <string name="settings_url_summary">服务地址</string>
-  <string name="settings_interval_title">频率</string>
+  <string name="settings_interval_title">定位频率（秒）</string>
   <string name="settings_interval_summary">报告间隔（秒）</string>
   <string name="settings_distance_title">距离</string>
   <string name="settings_distance_summary">报告距离（米）</string>
   <string name="settings_angle_title">角度</string>
   <string name="settings_angle_summary">报告角度（度）</string>
-  <string name="settings_status_title">设备状态</string>
+  <string name="settings_status_title">定位</string>
   <string name="settings_status_off">开始</string>
   <string name="settings_status_on">停止</string>
   <string name="settings_status_off_summary">服务已停止</string>
   <string name="settings_status_on_summary">服务运行中</string>
-  <string name="settings_provider_title">定位形式</string>
-  <string name="settings_provider_summary">本地数据源</string>
-  <string name="settings_provider_gps">GPS定位</string>
-  <string name="settings_provider_network">网络定位</string>
-  <string name="settings_provider_mixed">混合定位</string>
+  <string name="settings_accuracy_title">位置精度</string>
+  <string name="settings_accuracy_summary">期望位置精度</string>
+  <string name="settings_accuracy_high">高</string>
+  <string name="settings_accuracy_medium">中</string>
+  <string name="settings_accuracy_low">低</string>
   <string name="settings_foreground_title">前台服务</string>
   <string name="settings_foreground_summary">提高服务优先级</string>
-  <string name="menu_status">状态</string>
+  <string name="menu_status">定位状态</string>
   <string name="menu_about">关于</string>
   <string name="menu_shortcuts">添加图标</string>
   <string name="menu_clear">清除</string>
   <string name="about_description">Android设备的实时GPS跟踪器。兼容Traccar服务器和其他跟踪系统。</string>
   <string name="about_license">此应用免费且开源。源码许可为Apache V2.0，在GitHub上发布。</string>
   <string name="about_web">更多信息请访问www.traccar.org/client</string>
+  <string name="status_service_create">服务已开始</string>
+  <string name="status_service_destroy">服务已停止</string>
   <string name="status_send_success">发送成功</string>
   <string name="status_send_fail">发送失败</string>
   <string name="status_location_update">位置更新</string>
-  <string name="status_connectivity_change">连接变化</string>
+  <string name="status_network_online">网络在线</string>
+  <string name="status_network_offline">网络离线</string>
   <string name="hidden_app_name">设备设置</string>
   <string name="hidden_alert">APP已隐藏，请拨号8722227重新打开</string>
   <string name="error_msg_invalid_url">请输入有效的地址，如http://或https://</string>

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

@@ -20,26 +20,23 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Service stopped</string>
   <string name="settings_status_on_summary">Service running</string>
-  <string name="settings_provider_title">Location provider</string>
-  <string name="settings_provider_summary">Source of location data</string>
-  <string name="settings_provider_gps">GPS provider</string>
-  <string name="settings_provider_network">Network provider</string>
-  <string name="settings_provider_mixed">Mixed provider</string>
+  <string name="settings_accuracy_title">Location accuracy</string>
+  <string name="settings_accuracy_summary">Desired location accuracy</string>
+  <string name="settings_accuracy_high">High</string>
+  <string name="settings_accuracy_medium">Medium</string>
+  <string name="settings_accuracy_low">Low</string>
   <string name="settings_foreground_title">Foreground service</string>
   <string name="settings_foreground_summary">Increase service priority</string>
   <string name="menu_status">Status</string>
-  <string name="menu_about">About</string>
   <string name="menu_shortcuts">Add shortcuts</string>
   <string name="menu_clear">Clear</string>
-  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
-  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
-  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
   <string name="status_service_create">Service started</string>
   <string name="status_service_destroy">Service stopped</string>
   <string name="status_send_success">Send successfully</string>
   <string name="status_send_fail">Send failed</string>
   <string name="status_location_update">Location update</string>
-  <string name="status_connectivity_change">Connectivity change</string>
+  <string name="status_network_online">Network online</string>
+  <string name="status_network_offline">Network offline</string>
   <string name="hidden_app_name">Device Settings</string>
   <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
   <string name="error_msg_invalid_url">Please enter a valid http:// or https:// URL</string>

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

@@ -3,16 +3,16 @@
 
     <string name="settings_url_default_value" translatable="false">http://demo.traccar.org:5055</string>
 
-    <string-array name="settings_provider_values" translatable="false">
-        <item>gps</item>
-        <item>network</item>
-        <item>mixed</item>
+    <string-array name="settings_accuracy_values" translatable="false">
+        <item>high</item>
+        <item>medium</item>
+        <item>low</item>
     </string-array>
 
-    <string-array name="settings_provider_names">
-        <item>@string/settings_provider_gps</item>
-        <item>@string/settings_provider_network</item>
-        <item>@string/settings_provider_mixed</item>
+    <string-array name="settings_accuracy_names">
+        <item>@string/settings_accuracy_high</item>
+        <item>@string/settings_accuracy_medium</item>
+        <item>@string/settings_accuracy_low</item>
     </string-array>
 
 </resources>

app/src/main/res/xml/network_security_config.xml

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

app/src/main/res/xml/preferences.xml

@@ -20,6 +20,14 @@
         android:summary="@string/settings_url_summary"
         android:title="@string/settings_url_title" />
 
+    <ListPreference
+        android:defaultValue="medium"
+        android:entries="@array/settings_accuracy_names"
+        android:entryValues="@array/settings_accuracy_values"
+        android:key="accuracy"
+        android:summary="@string/settings_accuracy_summary"
+        android:title="@string/settings_accuracy_title" />
+
     <EditTextPreference
         android:defaultValue="300"
         android:key="interval"
@@ -41,12 +49,4 @@
         android:summary="@string/settings_angle_summary"
         android:title="@string/settings_angle_title" />
 
-    <ListPreference
-        android:defaultValue="gps"
-        android:entries="@array/settings_provider_names"
-        android:entryValues="@array/settings_provider_values"
-        android:key="provider"
-        android:summary="@string/settings_provider_summary"
-        android:title="@string/settings_provider_title" />
-
 </PreferenceScreen>

app/src/regular/java/org/traccar/client/PositionProviderFactory.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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;
+
+public class PositionProviderFactory {
+
+    public static PositionProvider create(Context context, PositionProvider.PositionListener listener) {
+        return new AndroidPositionProvider(context, listener);
+    }
+
+}

app/src/test/java/org/traccar/client/DatabaseHelperTest.java

@@ -15,7 +15,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class DatabaseHelperTest {
 
     @Test

app/src/test/java/org/traccar/client/ProtocolFormatterTest.java

@@ -13,7 +13,6 @@ import java.util.Date;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class ProtocolFormatterTest {
 
     @Test

app/src/test/java/org/traccar/client/RequestManagerTest.java

@@ -10,7 +10,6 @@ import org.robolectric.annotation.Config;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
 public class RequestManagerTest {
 
     @Ignore

build.gradle

@@ -1,16 +1,19 @@
 buildscript {
     repositories {
+        google()
         jcenter()
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.google.gms:google-services:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'io.fabric.tools:gradle:1.26.1'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }

gradle.properties

@@ -0,0 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
+android.enableUnitTestBinaryResources=true

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip