Application version 3.8 release

Minimal fault on translation

app/build.gradle

@@ -1,22 +1,33 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         minSdkVersion 3
-        targetSdkVersion 22
-        versionCode 23
-        versionName "3.3"
+        targetSdkVersion 23
+        versionCode 28
+        versionName '3.8'
     }
 
     signingConfigs {
         release {
-            storeFile file('/home/user/Documents/android.keystore')
-            keyAlias "tananaev"
-            storePassword ""
-            keyPassword ""
+            storeFile file('../../android.keystore')
+            keyAlias 'tananaev'
+            storePassword ''
+            keyPassword ''
+        }
+    }
+
+    productFlavors {
+        regular {
+            applicationId "org.traccar.client"
+            buildConfigField "boolean", "HIDDEN_APP", "false"
+        }
+        hidden {
+            applicationId "org.traccar.client.hidden"
+            buildConfigField "boolean", "HIDDEN_APP", "true"
         }
     }
 
@@ -30,5 +41,16 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.0"
+    testCompile 'org.robolectric:robolectric:3.0'
+}
+
+task requestPasswords << {
+    android.signingConfigs.release.storePassword = new String(System.console().readPassword('\nStore password: '))
+    android.signingConfigs.release.keyPassword = new String(System.console().readPassword('Key password: '))
+}
+
+tasks.whenTaskAdded { theTask ->
+    if (theTask.name.equals('packageRegularRelease') || theTask.name.equals('packageHiddenRelease')) {
+        theTask.dependsOn 'requestPasswords'
+    }
 }

app/src/hidden/AndroidManifest.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+
+    <application
+        android:label="@string/hidden_app_name"
+        tools:replace="label">
+
+        <receiver android:name=".DialLaunchReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.NEW_OUTGOING_CALL" />
+            </intent-filter>
+        </receiver>
+
+    </application>
+
+</manifest>

app/src/main/AndroidManifest.xml

@@ -6,27 +6,42 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true" android:theme="@style/TraccarTheme">
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/TraccarTheme">
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:launchMode="singleTask" />
+
+        <activity-alias
+            android:name=".Launcher"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
-        <activity android:name=".StatusActivity">
-        </activity>
+        <activity android:name=".StatusActivity"/>
 
-        <activity android:name=".AboutActivity">
+        <activity android:name=".AboutActivity"/>
+
+        <activity
+            android:name=".ShortcutActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
         </activity>
 
         <service android:name=".TrackingService" />
 
+        <service android:name=".TrackingService$HideNotificationService" />
+
         <receiver android:name=".AutostartReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />

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

@@ -25,10 +25,10 @@ public class AutostartReceiver extends WakefulBroadcastReceiver {
     
     @Override
     public void onReceive(Context context, Intent intent) {
-    	SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    	if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
-    		context.startService(new Intent(context, TrackingService.class));
-    	}
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
+            startWakefulService(context, new Intent(context, TrackingService.class));
+        }
     }
 
 }

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

@@ -31,8 +31,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "traccar.db";
 
     public interface DatabaseHandler<T> {
-        void onSuccess(T result);
-        void onFailure(RuntimeException error);
+        void onComplete(boolean success, T result);
     }
 
     private static abstract class DatabaseAsyncTask<T> extends AsyncTask<Void, Void, T> {
@@ -58,11 +57,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 
         @Override
         protected void onPostExecute(T result) {
-            if (error == null) {
-                handler.onSuccess(result);
-            } else {
-                handler.onFailure(error);
-            }
+            handler.onComplete(error == null, result);
         }
     }
 

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DialLaunchReceiver extends BroadcastReceiver {
+
+    private static final String LAUNCHER_NUMBER = "8722227"; // TRACCAR
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
+        if (phoneNumber.equals(LAUNCHER_NUMBER)) {
+            setResultData(null);
+            Intent appIntent = new Intent(context, MainActivity.class);
+            appIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(appIntent);
+        }
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,29 @@
  */
 package org.traccar.client;
 
+import android.Manifest;
 import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.location.LocationManager;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
+import android.preference.TwoStatePreference;
+import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+
 @SuppressWarnings("deprecation")
 public class MainActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
 
@@ -40,60 +47,137 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     public static final String KEY_INTERVAL = "interval";
     public static final String KEY_PROVIDER = "provider";
     public static final String KEY_STATUS = "status";
-    public static final String KEY_FOREGROUND = "foreground";
 
-    private boolean firstLaunch; // DELME
+    private static final int PERMISSIONS_REQUEST_LOCATION = 2;
+
+    private SharedPreferences sharedPreferences;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        firstLaunch = !PreferenceManager.getDefaultSharedPreferences(this).contains(KEY_PORT);
+
+        if (BuildConfig.HIDDEN_APP) {
+            removeLauncherIcon();
+        }
+
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
 
-        // DELME
-        if (PreferenceManager.getDefaultSharedPreferences(this).getString(KEY_PROVIDER, null).equals("mixed")) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putString(KEY_PROVIDER, LocationManager.GPS_PROVIDER).commit();
-        }
+        findPreference(KEY_DEVICE).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                return newValue != null && !newValue.equals("");
+            }
+        });
+        findPreference(KEY_ADDRESS).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
+                    return newValue != null && Patterns.DOMAIN_NAME.matcher((String) newValue).matches();
+                } else {
+                    return newValue != null && !((String) newValue).isEmpty();
+                }
+            }
+        });
+        findPreference(KEY_PORT).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue != null) {
+                    try {
+                        int value = Integer.parseInt((String) newValue);
+                        if (value > 0 && value <= 65536) {
+                            return true;
+                        }
+                    } catch (NumberFormatException e) {
+                    }
+                }
+                return false;
+            }
+        });
+        findPreference(KEY_INTERVAL).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue != null) {
+                    try {
+                        Integer.parseInt((String) newValue);
+                        return true;
+                    } catch (NumberFormatException e) {
+                    }
+                }
+                return false;
+            }
+        });
 
-        if (getPreferenceScreen().getSharedPreferences().getBoolean(KEY_STATUS, false)) {
-            setPreferencesEnabled(false);
-            startService(new Intent(this, TrackingService.class));
+        if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
+            startTrackingService(true, false);
         }
     }
 
+    private void removeLauncherIcon() {
+        String className = MainActivity.class.getCanonicalName().replace(".MainActivity", ".Launcher");
+        ComponentName componentName = new ComponentName(getPackageName(), className);
+        PackageManager packageManager = getPackageManager();
+        if (packageManager.getComponentEnabledSetting(componentName) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            packageManager.setComponentEnabledSetting(
+                    componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setMessage(getString(R.string.hidden_alert));
+            builder.setPositiveButton(android.R.string.ok, null);
+            builder.show();
+        }
+    }
+
+    private void addShortcuts(boolean start, int name) {
+        Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
+        shortcutIntent.setComponent(new ComponentName(getPackageName(), ".ShortcutActivity"));
+        shortcutIntent.putExtra(ShortcutActivity.EXTRA_ACTION, start);
+
+        Intent installShortCutIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
+        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(name));
+        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher));
+
+        sendBroadcast(installShortCutIntent);
+    }
+
+    private boolean hasPermission(String permission) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            return true;
+        }
+        return checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
-        checkAndShowPortDialog(); // DELME
-        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+        sharedPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        sharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
     }
 
     private void setPreferencesEnabled(boolean enabled) {
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.findPreference(KEY_DEVICE).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_ADDRESS).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_PORT).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_INTERVAL).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_PROVIDER).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_FOREGROUND).setEnabled(enabled);
+        findPreference(KEY_DEVICE).setEnabled(enabled);
+        findPreference(KEY_ADDRESS).setEnabled(enabled);
+        findPreference(KEY_PORT).setEnabled(enabled);
+        findPreference(KEY_INTERVAL).setEnabled(enabled);
+        findPreference(KEY_PROVIDER).setEnabled(enabled);
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if (key.equals(KEY_STATUS)) {
             if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
-                setPreferencesEnabled(false);
-                startService(new Intent(this, TrackingService.class));
+                startTrackingService(true, false);
             } else {
-                stopService(new Intent(this, TrackingService.class));
-                setPreferencesEnabled(true);
+                stopTrackingService();
             }
         } else if (key.equals(KEY_DEVICE)) {
             findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
@@ -111,6 +195,10 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         if (item.getItemId() == R.id.status) {
             startActivity(new Intent(this, StatusActivity.class));
             return true;
+        } else if (item.getItemId() == R.id.shortcuts) {
+            addShortcuts(true, R.string.shortcut_start);
+            addShortcuts(false, R.string.shortcut_stop);
+            return true;
         } else if (item.getItemId() == R.id.about) {
             startActivity(new Intent(this, AboutActivity.class));
             return true;
@@ -121,46 +209,57 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     private void initPreferences() {
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
-        TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-        String id = telephonyManager.getDeviceId();
-
-        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
-
         if (!sharedPreferences.contains(KEY_DEVICE)) {
+            String id = String.valueOf(new Random().nextInt(900000) + 100000);
             sharedPreferences.edit().putString(KEY_DEVICE, id).commit();
+            ((EditTextPreference) findPreference(KEY_DEVICE)).setText(id);
         }
-        findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, id));
+        findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
     }
 
-    // TEMPORARY PORT CHANGE DIALOG (DELME)
-
-    private void checkAndShowPortDialog() {
-
-        String KEY_SHOWN_PORT_DIALOG = "portDialogHasBeenShown";
-
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if (!firstLaunch) {
-            if (!preferences.contains(KEY_SHOWN_PORT_DIALOG)) {
-                showDialog(0);
+    private void startTrackingService(boolean checkPermission, boolean permission) {
+        if (checkPermission) {
+            Set<String> missingPermissions = new HashSet<>();
+            if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
+                missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
+            }
+            if (!hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+                missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
+            }
+            if (missingPermissions.isEmpty()) {
+                permission = true;
+            } else {
+                requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]), PERMISSIONS_REQUEST_LOCATION);
+                return;
             }
         }
 
-        preferences.edit().putBoolean(KEY_SHOWN_PORT_DIALOG, true).commit();
+        if (permission) {
+            setPreferencesEnabled(false);
+            startService(new Intent(this, TrackingService.class));
+        } else {
+            sharedPreferences.edit().putBoolean(KEY_STATUS, false).commit();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+                TwoStatePreference preference = (TwoStatePreference) findPreference(KEY_STATUS);
+                preference.setChecked(false);
+            } else {
+                CheckBoxPreference preference = (CheckBoxPreference) findPreference(KEY_STATUS);
+                preference.setChecked(false);
+            }
+        }
+    }
+
+    private void stopTrackingService() {
+        stopService(new Intent(this, TrackingService.class));
+        setPreferencesEnabled(true);
     }
 
     @Override
-    protected Dialog onCreateDialog(int id) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setMessage("Communication protocol used by the app has changed. Now it uses port 5055 on Traccar server. Do you want to change port to 5055?")
-                .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        PreferenceManager.getDefaultSharedPreferences(MainActivity.this).edit().putString(KEY_PORT, "5055").commit();
-                    }
-                })
-                .setNegativeButton("No", null);
-
-        return builder.create();
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
+            startTrackingService(false, grantResults[0] == PackageManager.PERMISSION_GRANTED &&
+                    (permissions.length < 2 || grantResults[1] == PackageManager.PERMISSION_GRANTED));
+        }
     }
 
 }

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

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.Context;
+import android.location.GpsStatus;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+public class MixedPositionProvider extends PositionProvider implements LocationListener, GpsStatus.Listener {
+
+    private static int FIX_TIMEOUT = 30 * 1000;
+
+    private LocationListener backupListener;
+    private long lastFixTime;
+
+    public MixedPositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+    }
+
+    public void startUpdates() {
+        lastFixTime = System.currentTimeMillis();
+        locationManager.addGpsStatusListener(this);
+        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, this);
+    }
+
+    public void stopUpdates() {
+        locationManager.removeUpdates(this);
+        locationManager.removeGpsStatusListener(this);
+        stopBackupProvider();
+    }
+
+    private void startBackupProvider() {
+        Log.i(TAG, "backup provider start");
+        if (backupListener == null) {
+
+            backupListener = new LocationListener() {
+                @Override
+                public void onLocationChanged(Location location) {
+                    Log.i(TAG, "backup provider location");
+                    updateLocation(location);
+                }
+
+                @Override
+                public void onStatusChanged(String s, int i, Bundle bundle) {
+                }
+
+                @Override
+                public void onProviderEnabled(String s) {
+                }
+
+                @Override
+                public void onProviderDisabled(String s) {
+                }
+            };
+
+            locationManager.requestLocationUpdates(
+                    LocationManager.NETWORK_PROVIDER, period, 0, backupListener);
+        }
+    }
+
+    private void stopBackupProvider() {
+        Log.i(TAG, "backup provider stop");
+        if (backupListener != null) {
+            locationManager.removeUpdates(backupListener);
+            backupListener = null;
+        }
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        Log.i(TAG, "provider location");
+        stopBackupProvider();
+        lastFixTime = System.currentTimeMillis();
+        updateLocation(location);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+        Log.i(TAG, "provider enabled");
+        stopBackupProvider();
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+        Log.i(TAG, "provider disabled");
+        startBackupProvider();
+    }
+
+    @Override
+    public void onGpsStatusChanged(int event) {
+        if (backupListener == null && System.currentTimeMillis() - (lastFixTime + period) > FIX_TIMEOUT) {
+            startBackupProvider();
+        }
+    }
+
+}

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

@@ -21,17 +21,15 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.location.Location;
-import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.BatteryManager;
 import android.os.Build;
-import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-public class PositionProvider implements LocationListener {
+public abstract class PositionProvider {
 
-    private static final String TAG = PositionProvider.class.getSimpleName();
+    protected static final String TAG = PositionProvider.class.getSimpleName();
 
     public interface PositionListener {
         void onPositionUpdate(Position position);
@@ -41,11 +39,13 @@ public class PositionProvider implements LocationListener {
 
     private final Context context;
     private final SharedPreferences preferences;
-    private final LocationManager locationManager;
+    protected final LocationManager locationManager;
 
     private String deviceId;
-    private String type;
-    private final long period;
+    protected String type;
+    protected final long period;
+
+    private long lastUpdateTime;
 
     public PositionProvider(Context context, PositionListener listener) {
         this.context = context;
@@ -55,48 +55,27 @@ public class PositionProvider implements LocationListener {
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
 
         deviceId = preferences.getString(MainActivity.KEY_DEVICE, null);
-        type = preferences.getString(MainActivity.KEY_PROVIDER, null);
         period = Integer.parseInt(preferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000;
+
+        type = preferences.getString(MainActivity.KEY_PROVIDER, null);
     }
 
-    public void startUpdates() {
-        locationManager.requestLocationUpdates(type, period, 0, this);
-    }
+    public abstract void startUpdates();
 
-    public void stopUpdates() {
-        locationManager.removeUpdates(this);
-    }
+    public abstract void stopUpdates();
 
-    private long lastTime;
-
-    @Override
-    public void onLocationChanged(Location location) {
-        if (location != null && location.getTime() != lastTime) {
+    protected void updateLocation(Location location) {
+        if (location != null && location.getTime() != lastUpdateTime) {
             Log.i(TAG, "location new");
-            lastTime = location.getTime();
+            lastUpdateTime = location.getTime();
             listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel()));
         } else {
             Log.i(TAG, location != null ? "location old" : "location nil");
         }
     }
 
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-        Log.i(TAG, "provider status");
-    }
-
-    @Override
-    public void onProviderEnabled(String provider) {
-        Log.i(TAG, "provider enabled");
-    }
-
-    @Override
-    public void onProviderDisabled(String provider) {
-        Log.i(TAG, "provider disabled");
-    }
-
     @TargetApi(Build.VERSION_CODES.ECLAIR)
-    public double getBatteryLevel() {
+    private double getBatteryLevel() {
         if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ECLAIR) {
             Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
             int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);

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

@@ -28,7 +28,7 @@ public class ProtocolFormatter {
                 .appendQueryParameter("timestamp", String.valueOf(position.getTime().getTime() / 1000))
                 .appendQueryParameter("lat", String.valueOf(position.getLatitude()))
                 .appendQueryParameter("lon", String.valueOf(position.getLongitude()))
-                .appendQueryParameter("speed", String.valueOf(position.getSpeed() * 1.943844))
+                .appendQueryParameter("speed", String.valueOf(position.getSpeed()))
                 .appendQueryParameter("bearing", String.valueOf(position.getCourse()))
                 .appendQueryParameter("altitude", String.valueOf(position.getAltitude()))
                 .appendQueryParameter("batt", String.valueOf(position.getBattery()));

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

@@ -27,8 +27,7 @@ public class RequestManager {
     private static final int TIMEOUT = 15 * 1000;
 
     public interface RequestHandler {
-        void onSuccess();
-        void onFailure();
+        void onComplete(boolean success);
     }
 
     private static class RequestAsyncTask extends AsyncTask<String, Void, Boolean> {
@@ -46,11 +45,7 @@ public class RequestManager {
 
         @Override
         protected void onPostExecute(Boolean result) {
-            if (result) {
-                handler.onSuccess();
-            } else {
-                handler.onFailure();
-            }
+            handler.onComplete(result);
         }
     }
 

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+public class ShortcutActivity extends Activity {
+
+    public static final String EXTRA_ACTION = "shortcutAction";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        checkShortcutAction(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        checkShortcutAction(intent);
+    }
+
+    private void checkShortcutAction(Intent intent) {
+        if (intent.hasExtra(EXTRA_ACTION)) {
+            boolean start = intent.getBooleanExtra(EXTRA_ACTION, false);
+            PreferenceManager.getDefaultSharedPreferences(this)
+                    .edit().putBoolean(MainActivity.KEY_STATUS, start).commit();
+            if (start) {
+                startService(new Intent(this, TrackingService.class));
+                Toast.makeText(this, R.string.status_service_create, Toast.LENGTH_SHORT).show();
+            } else {
+                stopService(new Intent(this, TrackingService.class));
+                Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
+            }
+            finish();
+        }
+    }
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+
+public class SimplePositionProvider extends PositionProvider implements LocationListener {
+
+    public SimplePositionProvider(Context context, PositionListener listener) {
+        super(context, listener);
+        if (!type.equals(LocationManager.NETWORK_PROVIDER)) {
+            type = LocationManager.GPS_PROVIDER;
+        }
+    }
+
+    public void startUpdates() {
+        locationManager.requestLocationUpdates(type, period, 0, this);
+    }
+
+    public void stopUpdates() {
+        locationManager.removeUpdates(this);
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        updateLocation(location);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+    }
+
+}

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

@@ -17,6 +17,7 @@ package org.traccar.client;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
@@ -35,21 +36,45 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private Handler handler;
     private SharedPreferences preferences;
 
+    private String address;
+    private int port;
+
     private PositionProvider positionProvider;
     private DatabaseHelper databaseHelper;
     private NetworkManager networkManager;
 
     private PowerManager.WakeLock wakeLock;
 
+    private void lock() {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+            wakeLock.acquire();
+        } else {
+            wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        }
+    }
+
+    private void unlock() {
+        if (wakeLock.isHeld()) {
+            wakeLock.release();
+        }
+    }
+
     public TrackingController(Context context) {
         this.context = context;
         handler = new Handler();
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        positionProvider = new PositionProvider(context, this);
+        if (preferences.getString(MainActivity.KEY_PROVIDER, null).equals("mixed")) {
+            positionProvider = new MixedPositionProvider(context, this);
+        } else {
+            positionProvider = new SimplePositionProvider(context, this);
+        }
         databaseHelper = new DatabaseHelper(context);
         networkManager = new NetworkManager(context, this);
         isOnline = networkManager.isOnline();
 
+        address = preferences.getString(MainActivity.KEY_ADDRESS, null);
+        port = Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null));
+
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
     }
@@ -58,26 +83,35 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         if (isOnline) {
             read();
         }
-        positionProvider.startUpdates();
+        try {
+            positionProvider.startUpdates();
+        } catch (SecurityException e) {
+            Log.w(TAG, e);
+        }
         networkManager.start();
     }
 
     public void stop() {
         networkManager.stop();
-        positionProvider.stopUpdates();
+        try {
+            positionProvider.stopUpdates();
+        } catch (SecurityException e) {
+            Log.w(TAG, e);
+        }
         handler.removeCallbacksAndMessages(null);
     }
 
     @Override
     public void onPositionUpdate(Position position) {
+        StatusActivity.addMessage(context.getString(R.string.status_location_update));
         if (position != null) {
-            StatusActivity.addMessage(context.getString(R.string.status_location_update));
             write(position);
         }
     }
 
     @Override
     public void onNetworkUpdate(boolean isOnline) {
+        StatusActivity.addMessage(context.getString(R.string.status_connectivity_change));
         if (!this.isOnline && isOnline) {
             read();
         }
@@ -105,84 +139,75 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private void write(Position position) {
         log("write", position);
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        lock();
         databaseHelper.insertPositionAsync(position, new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
-            public void onSuccess(Void result) {
-                if (isOnline && isWaiting) {
-                    read();
-                    isWaiting = false;
+            public void onComplete(boolean success, Void result) {
+                if (success) {
+                    if (isOnline && isWaiting) {
+                        read();
+                        isWaiting = false;
+                    }
                 }
-                wakeLock.release();
-            }
-
-            @Override
-            public void onFailure(RuntimeException error) {
-                wakeLock.release();
+                unlock();
             }
         });
     }
 
     private void read() {
         log("read", null);
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        lock();
         databaseHelper.selectPositionAsync(new DatabaseHelper.DatabaseHandler<Position>() {
             @Override
-            public void onSuccess(Position result) {
-                if (result != null) {
-                    send(result);
+            public void onComplete(boolean success, Position result) {
+                if (success) {
+                    if (result != null) {
+                        if (result.getDeviceId().equals(preferences.getString(MainActivity.KEY_DEVICE, null))) {
+                            send(result);
+                        } else {
+                            delete(result);
+                        }
+                    } else {
+                        isWaiting = true;
+                    }
                 } else {
-                    isWaiting = true;
+                    retry();
                 }
-                wakeLock.release();
-            }
-
-            @Override
-            public void onFailure(RuntimeException error) {
-                retry();
-                wakeLock.release();
+                unlock();
             }
         });
     }
 
     private void delete(Position position) {
         log("delete", position);
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        lock();
         databaseHelper.deletePositionAsync(position.getId(), new DatabaseHelper.DatabaseHandler<Void>() {
             @Override
-            public void onSuccess(Void result) {
-                read();
-                wakeLock.release();
-            }
-
-            @Override
-            public void onFailure(RuntimeException error) {
-                retry();
-                wakeLock.release();
+            public void onComplete(boolean success, Void result) {
+                if (success) {
+                    read();
+                } else {
+                    retry();
+                }
+                unlock();
             }
         });
     }
 
     private void send(final Position position) {
         log("send", position);
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
-        String request = ProtocolFormatter.formatRequest(
-                preferences.getString(MainActivity.KEY_ADDRESS, null),
-                Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),
-                position);
-
+        lock();
+        String request = ProtocolFormatter.formatRequest(address, port, position);
         RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
             @Override
-            public void onSuccess() {
-                delete(position);
-                wakeLock.release();
-            }
-
-            @Override
-            public void onFailure() {
-                StatusActivity.addMessage(context.getString(R.string.status_send_fail));
-                retry();
-                wakeLock.release();
+            public void onComplete(boolean success) {
+                if (success) {
+                    delete(position);
+                } else {
+                    StatusActivity.addMessage(context.getString(R.string.status_send_fail));
+                    retry();
+                }
+                unlock();
             }
         });
     }

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

@@ -19,12 +19,16 @@ import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 public class TrackingService extends Service {
 
     private static final String TAG = TrackingService.class.getSimpleName();
@@ -32,7 +36,49 @@ public class TrackingService extends Service {
 
     private TrackingController trackingController;
 
-    private boolean foreground;
+    @SuppressWarnings("deprecation")
+    private static Notification createNotification(Context context) {
+        Intent notificationIntent = new Intent(context, MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
+
+        Notification notification = new Notification(android.R.drawable.stat_notify_sync_noanim, null, 0);
+        try {
+            Method method = notification.getClass().getMethod("setLatestEventInfo", Context.class, CharSequence.class, CharSequence.class, PendingIntent.class);
+            try {
+                method.invoke(notification, context, context.getString(R.string.app_name), context.getString(R.string.settings_status_on_summary), pendingIntent);
+            } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
+                Log.w(TAG, e);
+            }
+        } catch (SecurityException | NoSuchMethodException e) {
+            Log.w(TAG, e);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            notification.priority = Notification.PRIORITY_MIN;
+        }
+
+        return notification;
+    }
+
+    @TargetApi(Build.VERSION_CODES.ECLAIR)
+    public static class HideNotificationService extends Service {
+        @Override
+        public IBinder onBind(Intent intent) {
+            return null;
+        }
+
+        @Override
+        public void onCreate() {
+            startForeground(NOTIFICATION_ID, createNotification(this));
+            stopForeground(true);
+        }
+
+        @Override
+        public int onStartCommand(Intent intent, int flags, int startId) {
+            stopSelfResult(startId);
+            return START_NOT_STICKY;
+        }
+    }
 
     @Override
     public void onCreate() {
@@ -42,7 +88,10 @@ public class TrackingService extends Service {
         trackingController = new TrackingController(this);
         trackingController.start();
 
-        foreground = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(MainActivity.KEY_FOREGROUND, false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
+            startForeground(NOTIFICATION_ID, createNotification(this));
+            startService(new Intent(this, HideNotificationService.class));
+        }
     }
 
     @Override
@@ -53,17 +102,8 @@ public class TrackingService extends Service {
     @SuppressWarnings("deprecation")
     @Override
     public void onStart(Intent intent, int startId) {
-        AutostartReceiver.completeWakefulIntent(intent);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR && foreground) {
-            Intent notificationIntent = new Intent(this, MainActivity.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
-
-            Notification notification = new Notification(android.R.drawable.stat_notify_sync_noanim, null, 0);
-            notification.setLatestEventInfo(
-                    this, getString(R.string.app_name), getString(R.string.settings_status_on_summary), pendingIntent);
-
-            startForeground(NOTIFICATION_ID, notification);
+        if (intent != null) {
+            AutostartReceiver.completeWakefulIntent(intent);
         }
     }
 
@@ -79,7 +119,7 @@ public class TrackingService extends Service {
         Log.i(TAG, "service destroy");
         StatusActivity.addMessage(getString(R.string.status_service_destroy));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR && foreground) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
             stopForeground(true);
         }
 

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

@@ -13,7 +13,7 @@
         android:layout_marginLeft="@dimen/about_margin"
         android:layout_marginStart="@dimen/about_margin"
         android:layout_marginTop="@dimen/about_margin"
-        android:src="@drawable/ic_launcher"
+        android:src="@drawable/logo"
         android:contentDescription="@string/app_logo" />
 
     <LinearLayout

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

@@ -6,9 +6,14 @@
         android:title="@string/menu_status"
         android:showAsAction="always" />
 
+    <item
+        android:id="@+id/shortcuts"
+        android:title="@string/menu_shortcuts"
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/about"
         android:title="@string/menu_about"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="never" />
 
 </menu>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>GPS</item>
         <item>Mobilní síť</item>
+        <item>Obojí</item>
     </string-array>
     <string name="settings_foreground_title">Popředí služba</string>
     <string name="settings_foreground_summary">Zvýšit prioritu služba</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Služba vytvořena</string>
     <string name="status_service_destroy">Služba zastavena</string>
-    <string name="status_connection_success">Spojení se zdařilo</string>
-    <string name="status_connection_fail">Spojení selhalo</string>
     <string name="status_send_fail">Odesílání selhalo</string>
     <string name="status_location_update">Aktualizace pozice</string>
-    <string name="status_preference_update">Aktualizace nastavení</string>
     <string name="status_connectivity_change">Změna připojení</string>
 
 </resources>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>GPS udbyder</item>
         <item>Netværks udbyder</item>
+        <item>Mixet udbyder</item>
     </string-array>
     <string name="settings_foreground_title">Forgrunden tjeneste</string>
     <string name="settings_foreground_summary">Øg tjeneste prioritet</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Service oprettet</string>
     <string name="status_service_destroy">Service ødelagt</string>
-    <string name="status_connection_success">Forbindelse lykkedes</string>
-    <string name="status_connection_fail">Forbindelse fejlet</string>
     <string name="status_send_fail">Send fejl</string>
     <string name="status_location_update">Placering opdateret</string>
-    <string name="status_preference_update">Oplysninger opdateret</string>
     <string name="status_connectivity_change">Connectivity forandring</string>
 
 </resources>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>GPS</item>
         <item>Netzwerk</item>
+        <item>Gemischt</item>
     </string-array>
     <string name="settings_foreground_title">Vordergrund service</string>
     <string name="settings_foreground_summary">Erhöhen service priorität</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Dienst installiert</string>
     <string name="status_service_destroy">Dienst zerstört</string>
-    <string name="status_connection_success">Verbindung erfolgreich</string>
-    <string name="status_connection_fail">Verbindung fehlerhaft</string>
     <string name="status_send_fail">Übertragung fehlerhaft</string>
     <string name="status_location_update">Positionsupdate</string>
-    <string name="status_preference_update">Prioritätsupdate</string>
     <string name="status_connectivity_change">Anschlusswechsel</string>
 
 </resources>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>Proveedor GPS</item>
         <item>Proveedor de red</item>
+        <item>Proveedor mixto</item>
 	</string-array>
     <string name="settings_foreground_title">Servicio de primer plano</string>
     <string name="settings_foreground_summary">Aumentar prioridad de servicio</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Servicio creado</string>
     <string name="status_service_destroy">Servicio destruído</string>
-    <string name="status_connection_success">Conexión realizada</string>
-    <string name="status_connection_fail">Fallo en la conexión</string>
-    <string name="status_send_fail">Erro en el envío</string>
+    <string name="status_send_fail">Error en el envío</string>
     <string name="status_location_update">Posición actualizada</string>
-    <string name="status_preference_update">Preferencias actualizadas</string>
     <string name="status_connectivity_change">Cambio conectividad</string>
 
 </resources>	 

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>Mode GPS uniquement</item>
         <item>Mode cellulaire uniquement</item>
+        <item>Mode hybride</item>
     </string-array>
     <string name="settings_foreground_title">Un service de premier plan</string>
     <string name="settings_foreground_summary">Augmenter la priorité de service</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Service créé</string>
     <string name="status_service_destroy">Service supprimé</string>
-    <string name="status_connection_success">Connexion établie avec le serveur</string>
-    <string name="status_connection_fail">Echec de la connexion au serveur</string>
     <string name="status_send_fail">L’envoi de localisation a échoué</string>
     <string name="status_location_update">Localisation mise à jour</string>
-    <string name="status_preference_update">Mise à jour des préférences</string>
     <string name="status_connectivity_change">Changement de connectivité</string>
 
 </resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar Client</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Identificativo dispositivo</string>
+    <string name="settings_address_title">Indrizzo server</string>
+    <string name="settings_address_summary">Nome del dominio o indizzo IP</string>
+    <string name="settings_port_title">Porta server</string>
+    <string name="settings_port_summary">Porta TCP del Tracking server</string>
+    <string name="settings_interval_title">Frequenza</string>
+    <string name="settings_interval_summary">Intervallo in secondi tra i messaggi</string>
+    <string name="settings_status_title">Stato del servizio</string>
+    <string name="settings_status_off">Start</string>
+    <string name="settings_status_on">Stop</string>
+    <string name="settings_status_off_summary">Servizio arrestatto</string>
+    <string name="settings_status_on_summary">Servizio avviato</string>
+    <string name="settings_provider_title">Posizione provider</string>
+    <string name="settings_provider_summary">Sorgente dei dati di localizzazione</string>
+    <string-array name="settings_provider_names">
+        <item>GPS provider</item>
+        <item>Network provider</item>
+        <item>Mixed provider</item>
+    </string-array>
+    <string name="settings_foreground_title">Foreground service</string>
+    <string name="settings_foreground_summary">Aumenta la priorita` del servizio</string>
+
+    <string name="menu_status">Stato</string>
+    <string name="menu_about">About</string>
+    <string name="menu_clear">Pulisici</string>
+    
+    <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 e` gratuita e open source, il codice sorgente e` 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 creato</string>
+    <string name="status_service_destroy">Servizio distrutto</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="hidden_app_name">Impostazioni dispositivo</string>
+    <string name="hidden_alert">La app e` stata nascosta. Per aprirla nuovamente digita 8722227 (TRACCAR).</string>
+
+</resources>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>GPS-lokalisering</item>
         <item>Nettverkslokalisering</item>
+        <item>Blandet lokalisering</item>
     </string-array>
     <string name="settings_foreground_title">Forgrunnen tjeneste</string>
     <string name="settings_foreground_summary">Øk tjeneste prioritet</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Tjeneste opprettet</string>
     <string name="status_service_destroy">Tjeneste ødelagt</string>
-    <string name="status_connection_success">Tilkobling var vellykket</string>
-    <string name="status_connection_fail">Tilkobling mislyktes</string>
     <string name="status_send_fail">Sending mislyktes</string>
     <string name="status_location_update">Plassering oppdatert</string>
-    <string name="status_preference_update">Innstillinger oppdatert</string>
     <string name="status_connectivity_change">Tilkobling forandret</string>
 
 </resources>

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

@@ -21,6 +21,7 @@
     <string-array name="settings_provider_names">
         <item>Provedor GPS</item>
         <item>Provedor Rede</item>
+        <item>Provedor Misto</item>
     </string-array>
     <string name="settings_foreground_title">Serviço primeiro plano</string>
     <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Serviço criado</string>
     <string name="status_service_destroy">Serviço destruído</string>
-    <string name="status_connection_success">Sucesso na conexão</string>
-    <string name="status_connection_fail">Falha na conexão</string>
     <string name="status_send_fail">Falha no envio</string>
     <string name="status_location_update">Localização atualizada</string>
-    <string name="status_preference_update">Preferências atualizadas</string>
     <string name="status_connectivity_change">Mudança de conectividade</string>
 
 </resources>

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

@@ -21,8 +21,9 @@
     <string-array name="settings_provider_names">
         <item>GPS провайдер</item>
         <item>Сетевой провайдер</item>
+        <item>Смешанный провайдер</item>
     </string-array>
-    <string name="settings_foreground_title">Приотитетный сервис</string>
+    <string name="settings_foreground_title">Приоритетный сервис</string>
     <string name="settings_foreground_summary">Увеличить приоритет сервиса</string>
 
     <string name="menu_status">Состояние</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Сервис создан</string>
     <string name="status_service_destroy">Сервис удален</string>
-    <string name="status_connection_success">Соедниение установлено</string>
-    <string name="status_connection_fail">Ошибка установки соединения</string>
     <string name="status_send_fail">Ошибка отправки</string>
     <string name="status_location_update">Обновление местоположения</string>
-    <string name="status_preference_update">Обновление настроек</string>
     <string name="status_connectivity_change">Изменение подключения</string>
 
 </resources>

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

@@ -21,9 +21,10 @@
     <string-array name="settings_provider_names">
         <item>GPS provajder</item>
         <item>Provajder Mreže</item>
+        <item>Oba zajedno provajdera</item>
     </string-array>
     <string name="settings_foreground_title">Prvi plan servis</string>
-        <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
+    <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
 
     <string name="menu_status">Status</string>
     <string name="menu_about">O klijentu</string>
@@ -35,11 +36,8 @@
 
     <string name="status_service_create">Servis kreiran</string>
     <string name="status_service_destroy">Servis uništen</string>
-    <string name="status_connection_success">Konekcija uspešna</string>
-    <string name="status_connection_fail">Konekcija neuspešna</string>
     <string name="status_send_fail">Slanje neuspešno</string>
     <string name="status_location_update">Ažuriranje lokacije</string>
-    <string name="status_preference_update">Ažuriranje preferenci</string>
     <string name="status_connectivity_change">Promenjena konekcija</string>
 
 </resources>

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

@@ -3,6 +3,8 @@
 
     <string name="app_name">Traccar Client</string>
     <string name="app_logo">Traccar</string>
+    <string name="shortcut_start">Traccar - Start</string>
+    <string name="shortcut_stop">Traccar - Stop</string>
 
     <string name="settings_id_title">Device identifier</string>
     <string name="settings_address_title">Server address</string>
@@ -21,12 +23,14 @@
     <string-array name="settings_provider_names">
         <item>GPS provider</item>
         <item>Network provider</item>
+        <item>Mixed provider</item>
     </string-array>
     <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>
@@ -35,12 +39,11 @@
 
     <string name="status_service_create">Service created</string>
     <string name="status_service_destroy">Service destroyed</string>
-    <string name="status_connection_success">Connection succeeded</string>
-    <string name="status_connection_fail">Connection failed</string>
     <string name="status_send_fail">Send failed</string>
     <string name="status_location_update">Location update</string>
-    <string name="status_preference_update">Preference update</string>
     <string name="status_connectivity_change">Connectivity change</string>
-    <string name="status_provider_missing">Missing location provider</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>
 
 </resources>

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

@@ -4,6 +4,7 @@
     <string-array name="settings_provider_values" translatable="false">
         <item>gps</item>
         <item>network</item>
+        <item>mixed</item>
     </string-array>
 
 </resources>

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

@@ -42,10 +42,4 @@
         android:summary="@string/settings_provider_summary"
         android:title="@string/settings_provider_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="foreground"
-        android:summary="@string/settings_foreground_summary"
-        android:title="@string/settings_foreground_title" />
-
 </PreferenceScreen>

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

@@ -40,10 +40,4 @@
         android:summary="@string/settings_provider_summary"
         android:title="@string/settings_provider_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="foreground"
-        android:summary="@string/settings_foreground_summary"
-        android:title="@string/settings_foreground_title" />
-
 </PreferenceScreen>