App version 3.5 release

app/build.gradle

@@ -7,13 +7,13 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 22
-        versionCode 23
+        versionCode 25
-        versionName "3.3"
+        versionName "3.5"
     }
 
     signingConfigs {
         release {
-            storeFile file('/home/user/Documents/android.keystore')
+            storeFile file('../../android.keystore')
             keyAlias "tananaev"
             storePassword ""
             keyPassword ""
@@ -32,3 +32,14 @@ dependencies {
     testCompile 'junit:junit:4.12'
     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("packageRelease")) {
+        theTask.dependsOn "requestPasswords"
+    }
+}

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

@@ -22,13 +22,13 @@ import android.preference.PreferenceManager;
 import android.support.v4.content.WakefulBroadcastReceiver;
 
 public class AutostartReceiver extends WakefulBroadcastReceiver {
-	
+    
     @Override
     public void onReceive(Context context, Intent intent) {
-    	SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    	if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
+        if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
-    		context.startService(new Intent(context, TrackingService.class));
+            startWakefulService(context, new Intent(context, TrackingService.class));
-    	}
+        }
     }
 
 }

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

@@ -51,11 +51,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         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();
-        }
-
         if (getPreferenceScreen().getSharedPreferences().getBoolean(KEY_STATUS, false)) {
             setPreferencesEnabled(false);
             startService(new Intent(this, TrackingService.class));
@@ -139,9 +134,11 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         String KEY_SHOWN_PORT_DIALOG = "portDialogHasBeenShown";
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if (!firstLaunch) {
+        if (!preferences.getString(KEY_PORT, "5055").equals("5055")) {
-            if (!preferences.contains(KEY_SHOWN_PORT_DIALOG)) {
+            if (!firstLaunch) {
-                showDialog(0);
+                if (!preferences.contains(KEY_SHOWN_PORT_DIALOG)) {
+                    showDialog(0);
+                }
             }
         }
 

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;
+    protected String type;
-    private final long period;
+    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() {
+    public abstract void startUpdates();
-        locationManager.requestLocationUpdates(type, period, 0, this);
-    }
 
-    public void stopUpdates() {
+    public abstract void stopUpdates();
-        locationManager.removeUpdates(this);
-    }
 
-    private long lastTime;
+    protected void updateLocation(Location location) {
-
+        if (location != null && location.getTime() != lastUpdateTime) {
-    @Override
-    public void onLocationChanged(Location location) {
-        if (location != null && location.getTime() != lastTime) {
             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/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

@@ -41,11 +41,25 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     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);
-        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();
@@ -105,7 +119,7 @@ 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) {
@@ -113,19 +127,19 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                     read();
                     isWaiting = false;
                 }
-                wakeLock.release();
+                unlock();
             }
 
             @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) {
@@ -134,38 +148,38 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
                 } else {
                     isWaiting = true;
                 }
-                wakeLock.release();
+                unlock();
             }
 
             @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();
+                unlock();
             }
 
             @Override
             public void onFailure(RuntimeException error) {
                 retry();
-                wakeLock.release();
+                unlock();
             }
         });
     }
 
     private void send(final Position position) {
         log("send", position);
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        lock();
         String request = ProtocolFormatter.formatRequest(
                 preferences.getString(MainActivity.KEY_ADDRESS, null),
                 Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),
@@ -175,14 +189,14 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
             @Override
             public void onSuccess() {
                 delete(position);
-                wakeLock.release();
+                unlock();
             }
 
             @Override
             public void onFailure() {
                 StatusActivity.addMessage(context.getString(R.string.status_send_fail));
                 retry();
-                wakeLock.release();
+                unlock();
             }
         });
     }

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

@@ -53,7 +53,9 @@ public class TrackingService extends Service {
     @SuppressWarnings("deprecation")
     @Override
     public void onStart(Intent intent, int startId) {
-        AutostartReceiver.completeWakefulIntent(intent);
+        if (intent != null) {
+            AutostartReceiver.completeWakefulIntent(intent);
+        }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR && foreground) {
             Intent notificationIntent = new Intent(this, MainActivity.class);

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_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-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

@@ -21,6 +21,7 @@
     <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>
@@ -35,12 +36,8 @@
 
     <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>
 
 </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>