Update gradle project file

app/build.gradle

@@ -7,16 +7,16 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 22
-        versionCode 23
+        versionCode 24
-        versionName "3.3"
+        versionName "3.4"
     }
 
     signingConfigs {
         release {
-            storeFile file('/home/user/Documents/android.keystore')
+            storeFile file('../../android.keystore')
             keyAlias "tananaev"
-            storePassword ""
+            storePassword System.console().readLine("Enter store password: ")
-            keyPassword ""
+            keyPassword System.console().readLine("Enter key password: ")
         }
     }
 

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/PositionProvider.java

@@ -55,8 +55,12 @@ 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);
+        if (!type.equals(LocationManager.NETWORK_PROVIDER)) {
+            type = LocationManager.GPS_PROVIDER;
+        }
     }
 
     public void startUpdates() {

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

@@ -41,6 +41,16 @@ 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();
@@ -105,7 +115,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 +123,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 +144,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 +185,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,11 +35,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

@@ -35,12 +35,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>