Rework location provider system

res/values-es/strings.xml

@@ -23,11 +23,8 @@
     <string-array name="settings_provider_names">
         <item>Proveedor GPS</item>
         <item>Proveedor de red</item>
-    </string-array>
+        <item>Proveedor mixto</item>
-    <string-array name="settings_provider_values">
+	</string-array>
-        <item>gps</item>
-        <item>red</item>
-    </string-array>
 
     <string name="menu_status">Estado</string>
     <string name="menu_about">Acerca de&#8230;</string>
@@ -44,7 +41,6 @@
     <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_location_status">Estado proveedor cambiado</string>
     <string name="status_preference_update">Preferencias actualizadas</string>
 
 </resources>	 

res/values-ru/strings.xml

@@ -23,10 +23,7 @@
     <string-array name="settings_provider_names">
         <item>GPS провайдер</item>
         <item>Сетевой провайдер</item>
-    </string-array>
+        <item>Смешанный провайдер</item>
-    <string-array name="settings_provider_values">
-        <item>gps</item>
-        <item>network</item>
     </string-array>
 
     <string name="menu_status">Состояние</string>
@@ -44,7 +41,6 @@
     <string name="status_connection_fail">Ошибка установки соединения</string>
     <string name="status_send_fail">Ошибка отправки</string>
     <string name="status_location_update">Обновление местоположения</string>
-    <string name="status_location_status">Изменилось состояние провайдера</string>
     <string name="status_preference_update">Обновление настроек</string>
 
 </resources>

res/values/strings.xml

@@ -23,12 +23,9 @@
     <string-array name="settings_provider_names">
         <item>GPS provider</item>
         <item>Network provider</item>
+        <item>Mixed provider</item>
     </string-array>
-    <string-array name="settings_provider_values">
+    
-        <item>gps</item>
-        <item>network</item>
-    </string-array>
-
     <string name="menu_status">Status</string>
     <string name="menu_about">About</string>
     <string name="menu_clear">Clear</string>
@@ -44,7 +41,6 @@
     <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_location_status">Provider status changed</string>
     <string name="status_preference_update">Preference update</string>
 
 </resources>

res/values/values.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="settings_provider_values" translatable="false">
+        <item>gps</item>
+        <item>network</item>
+        <item>mixed</item>
+    </string-array>
+
+</resources>

res/xml-v14/preferences.xml

@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
-	<EditTextPreference
+    <EditTextPreference
         android:key="id"
         android:title="@string/settings_id_title" />
-    
+
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
         android:key="address"
-        android:title="@string/settings_address_title"
         android:summary="@string/settings_address_summary"
-        android:defaultValue="demo.traccar.org" />
+        android:title="@string/settings_address_title" />
 
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="5005"
         android:key="port"
-        android:title="@string/settings_port_title"
+        android:numeric="integer"
         android:summary="@string/settings_port_summary"
-        android:numeric="integer"
+        android:title="@string/settings_port_title" />
-        android:defaultValue="5005" />
-	
-	<EditTextPreference
-        android:key="interval"
-        android:title="@string/settings_interval_title"
-        android:summary="@string/settings_interval_summary"
-        android:numeric="integer"
-        android:defaultValue="60" />
 
-	<ListPreference
+    <EditTextPreference
-        android:key="provider"
+        android:defaultValue="60"
-        android:title="@string/settings_provider_title"
+        android:key="interval"
-        android:summary="@string/settings_provider_summary"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
         android:entries="@array/settings_provider_names"
         android:entryValues="@array/settings_provider_values"
-        android:defaultValue="gps" />
+        android:key="provider"
-	
+        android:summary="@string/settings_provider_summary"
+        android:title="@string/settings_provider_title" />
+
     <CheckBoxPreference
-        android:key="debug"
-        android:title="@string/settings_debug_title"
-        android:summary="@string/settings_debug_summary"
         android:defaultValue="true"
-        android:enabled="false" />
+        android:enabled="false"
+        android:key="debug"
+        android:summary="@string/settings_debug_summary"
+        android:title="@string/settings_debug_title" />
 
     <SwitchPreference
+        android:defaultValue="false"
         android:key="status"
-        android:title="@string/settings_status_title"
         android:summaryOff="@string/settings_status_off_summary"
-		android:summaryOn="@string/settings_status_on_summary"
+        android:summaryOn="@string/settings_status_on_summary"
-		android:switchTextOff="@string/settings_status_off"
+        android:switchTextOff="@string/settings_status_off"
-		android:switchTextOn="@string/settings_status_on"
+        android:switchTextOn="@string/settings_status_on"
-        android:defaultValue="false" />
+        android:title="@string/settings_status_title" />
 
-</PreferenceScreen>
+</PreferenceScreen>

res/xml/preferences.xml

@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
-	<EditTextPreference
+    <EditTextPreference
         android:key="id"
         android:title="@string/settings_id_title" />
-    
+
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
         android:key="address"
-        android:title="@string/settings_address_title"
         android:summary="@string/settings_address_summary"
-        android:defaultValue="demo.traccar.org" />
+        android:title="@string/settings_address_title" />
 
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="5005"
         android:key="port"
-        android:title="@string/settings_port_title"
+        android:numeric="integer"
         android:summary="@string/settings_port_summary"
-        android:numeric="integer"
+        android:title="@string/settings_port_title" />
-        android:defaultValue="5005" />
-	
-	<EditTextPreference
-        android:key="interval"
-        android:title="@string/settings_interval_title"
-        android:summary="@string/settings_interval_summary"
-        android:numeric="integer"
-        android:defaultValue="60" />
 
-	<ListPreference
+    <EditTextPreference
-        android:key="provider"
+        android:defaultValue="60"
-        android:title="@string/settings_provider_title"
+        android:key="interval"
-        android:summary="@string/settings_provider_summary"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
         android:entries="@array/settings_provider_names"
         android:entryValues="@array/settings_provider_values"
-        android:defaultValue="gps" />
+        android:key="provider"
+        android:summary="@string/settings_provider_summary"
+        android:title="@string/settings_provider_title" />
 
     <CheckBoxPreference
-        android:key="debug"
-        android:title="@string/settings_debug_title"
-        android:summary="@string/settings_debug_summary"
         android:defaultValue="true"
-        android:enabled="false" />
+        android:enabled="false"
+        android:key="debug"
+        android:summary="@string/settings_debug_summary"
+        android:title="@string/settings_debug_title" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="status"
-        android:title="@string/settings_status_title"
         android:summaryOff="@string/settings_status_off_summary"
-		android:summaryOn="@string/settings_status_on_summary"
+        android:summaryOn="@string/settings_status_on_summary"
-        android:defaultValue="false" />
+        android:title="@string/settings_status_title" />
 
 </PreferenceScreen>

src/org/traccar/client/ClientController.java

@@ -95,10 +95,10 @@ public class ClientController implements Connection.ConnectionHandler {
     @Override
     public void onConnected(boolean result) {
         if (result) {
-            StatusActivity.addMessage(context.getString((R.string.status_connection_success)));
+            StatusActivity.addMessage(context.getString(R.string.status_connection_success));
             connection.send(loginMessage);
         } else {
-            StatusActivity.addMessage(context.getString((R.string.status_connection_fail)));
+            StatusActivity.addMessage(context.getString(R.string.status_connection_fail));
             delayedReconnect();
         }
     }
@@ -110,7 +110,7 @@ public class ClientController implements Connection.ConnectionHandler {
                 connection.send(messageQueue.poll());
             }
         } else {
-            StatusActivity.addMessage(context.getString((R.string.status_send_fail)));
+            StatusActivity.addMessage(context.getString(R.string.status_send_fail));
             delayedReconnect();
         }
     }

src/org/traccar/client/PositionProvider.java

@@ -0,0 +1,136 @@
+/*
+ * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import java.util.Date;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.os.Bundle;
+import android.os.Handler;
+
+public class PositionProvider {
+
+    public static final String PROVIDER_MIXED = "mixed";
+    public static final long PERIOD_DELTA = 10 * 1000;
+    public static final long RETRY_PERIOD = 60 * 1000;
+
+    public interface PositionListener {
+        public void onPositionUpdate(Location location);
+    }
+
+    private final Handler handler;
+    private final LocationManager locationManager;
+    private final long period;
+    private final PositionListener listener;
+
+    private boolean useFine;
+    private boolean useCoarse;
+
+    public PositionProvider(Context context, String type, long period, PositionListener listener) {
+        handler = new Handler(context.getMainLooper());
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        this.period = period;
+        this.listener = listener;
+
+        // Determine providers
+        if (type.equals(PROVIDER_MIXED)) {
+            useFine = true;
+            useCoarse = true;
+        } else if (type.equals(LocationManager.GPS_PROVIDER)) {
+            useFine = true;
+        } else if (type.equals(LocationManager.NETWORK_PROVIDER)) {
+            useCoarse = true;
+        }
+    }
+
+    public void startUpdates() {
+        if (useFine) {
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, fineLocationListener);
+        }
+        if (useCoarse) {
+            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, period, 0, coarseLocationListener);
+        }
+        handler.postDelayed(updateTask, period);
+    }
+
+    public void stopUpdates() {
+        handler.removeCallbacks(updateTask);
+        locationManager.removeUpdates(fineLocationListener);
+        locationManager.removeUpdates(coarseLocationListener);
+    }
+
+    private final Runnable updateTask = new Runnable() {
+
+        private boolean tryProvider(String provider) {
+            Location location = locationManager.getLastKnownLocation(provider);
+
+            if (location != null && new Date().getTime() - location.getTime() <= period + PERIOD_DELTA) {
+                listener.onPositionUpdate(location);
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public void run() {
+            if (useFine && tryProvider(LocationManager.GPS_PROVIDER)) {
+            } else if (useCoarse && tryProvider(LocationManager.NETWORK_PROVIDER)) {
+            } else {
+                listener.onPositionUpdate(null);
+            }
+            handler.postDelayed(this, period);
+        }
+
+    };
+
+    private final InternalLocationListener fineLocationListener = new InternalLocationListener();
+    private final InternalLocationListener coarseLocationListener = new InternalLocationListener();
+
+    private class InternalLocationListener implements LocationListener {
+
+        @Override
+        public void onLocationChanged(Location location) {
+        }
+
+        @Override
+        public void onProviderDisabled(String provider) {
+        }
+
+        @Override
+        public void onProviderEnabled(String provider) {
+        }
+
+        @Override
+        public void onStatusChanged(final String provider, int status, Bundle extras) {
+            if (status == LocationProvider.TEMPORARILY_UNAVAILABLE || status == LocationProvider.OUT_OF_SERVICE) {
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        locationManager.removeUpdates(InternalLocationListener.this);
+                        locationManager.requestLocationUpdates(provider, period, 0, InternalLocationListener.this);
+                    }
+                }, RETRY_PERIOD);
+            }
+        }
+
+    }
+
+}

src/org/traccar/client/TraccarActivity.java

@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 import android.telephony.TelephonyManager;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -110,6 +111,8 @@ public class TraccarActivity extends PreferenceActivity {
     }
 
     private void initPreferences() {
+        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+
         TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         String id = telephonyManager.getDeviceId();
 

src/org/traccar/client/TraccarService.java

@@ -16,15 +16,10 @@
 package org.traccar.client;
 
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.location.LocationProvider;
-import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -44,7 +39,7 @@ public class TraccarService extends Service {
 
     private SharedPreferences sharedPreferences;
     private ClientController clientController;
-    private LocationManager locationManager;
+    private PositionProvider positionProvider;
 
     @Override
     public void onCreate() {
@@ -70,8 +65,8 @@ public class TraccarService extends Service {
         clientController = new ClientController(this, address, port, Protocol.createLoginMessage(id));
         clientController.start();
 
-        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+        positionProvider = new PositionProvider(this, provider, interval * 1000, positionListener);
-        locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
+        positionProvider.startUpdates();
 
         sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
 
@@ -89,35 +84,18 @@ public class TraccarService extends Service {
 
         sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
 
-        locationManager.removeUpdates(locationListener);
+        positionProvider.stopUpdates();
 
         clientController.stop();
     }
 
-    private LocationListener locationListener = new LocationListener() {
+    private PositionProvider.PositionListener positionListener = new PositionProvider.PositionListener() {
 
         @Override
-        public void onLocationChanged(Location location) {
+        public void onPositionUpdate(Location location) {
-            StatusActivity.addMessage(getString(R.string.status_location_update));
+            if (location != null) {
-            clientController.setNewLocation(Protocol.createLocationMessage(location));
+                StatusActivity.addMessage(getString(R.string.status_location_update));
-        }
+                clientController.setNewLocation(Protocol.createLocationMessage(location));
-
-        @Override
-        public void onProviderDisabled(String provider) {
-        }
-
-        @Override
-        public void onProviderEnabled(String provider) {
-        }
-
-        @Override
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-            StatusActivity.addMessage(getString(R.string.status_location_status));
-
-            if (status == LocationProvider.TEMPORARILY_UNAVAILABLE ||
-                    status == LocationProvider.OUT_OF_SERVICE) {
-                locationManager.removeUpdates(locationListener);
-                locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
             }
         }
 
@@ -130,22 +108,34 @@ public class TraccarService extends Service {
             StatusActivity.addMessage(getString(R.string.status_preference_update));
             try {
                 if (key.equals(TraccarActivity.KEY_ADDRESS)) {
+
                     address = sharedPreferences.getString(TraccarActivity.KEY_ADDRESS, null);
                     clientController.setNewServer(address, port);
+
                 } else if (key.equals(TraccarActivity.KEY_PORT)) {
+
                     port = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_PORT, null));
                     clientController.setNewServer(address, port);
+
                 } else if (key.equals(TraccarActivity.KEY_INTERVAL)) {
+
                     interval = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_INTERVAL, null));
-                    locationManager.removeUpdates(locationListener);
+                    positionProvider.stopUpdates();
-                    locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
+                    positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
+                    positionProvider.startUpdates();
+
                 } else if (key.equals(TraccarActivity.KEY_ID)) {
+
                     id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
                     clientController.setNewLogin(Protocol.createLoginMessage(id));
+
                 } else if (key.equals(TraccarActivity.KEY_PROVIDER)) {
+
                     provider = sharedPreferences.getString(TraccarActivity.KEY_PROVIDER, null);
-                    locationManager.removeUpdates(locationListener);
+                    positionProvider.stopUpdates();
-                    locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
+                    positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
+                    positionProvider.startUpdates();
+
                 }
             } catch (Exception error) {
                 Log.w(LOG_TAG, error);