From a395e4b8bae4a673a8d86843bc76f74d896c45ec Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 19 Jan 2013 21:03:09 +1300
Subject: [PATCH] Add location provider selection

---
 AndroidManifest.xml                         | 15 +++------
 res/values/strings.xml                      | 10 ++++++
 res/xml-v14/preferences.xml                 |  8 +++++
 res/xml/preferences.xml                     |  8 +++++
 src/org/traccar/client/TraccarActivity.java |  1 +
 src/org/traccar/client/TraccarService.java  | 35 +++++++++------------
 6 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2c2f891..6229733 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,29 +8,22 @@
     
     <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
     
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
         
-        <activity
-            android:name="TraccarActivity"
-            android:label="@string/app_name">
-            
+        <activity android:name="TraccarActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
 
-        <activity
-            android:name="StatusActivity"
-            android:label="@string/app_name">
+        <activity android:name="StatusActivity">
         </activity>
 
-        <activity
-            android:name="AboutActivity"
-            android:label="@string/app_name">
+        <activity android:name="AboutActivity">
         </activity>
         
         <service android:name="TraccarService" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea09ede..431e979 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,6 +18,16 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Service stopped</string>
     <string name="settings_status_on_summary">Service running</string>
+    <string name="settings_provider_title">Location provider</string>
+    <string name="settings_provider_summary">Source of location data</string>
+    <string-array name="settings_provider_names">
+        <item>GPS provider</item>
+        <item>Network 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>
diff --git a/res/xml-v14/preferences.xml b/res/xml-v14/preferences.xml
index e4bcfa6..2968ec2 100644
--- a/res/xml-v14/preferences.xml
+++ b/res/xml-v14/preferences.xml
@@ -26,6 +26,14 @@
         android:numeric="integer"
         android:defaultValue="60" />
 
+	<ListPreference
+        android:key="provider"
+        android:title="@string/settings_provider_title"
+        android:summary="@string/settings_provider_summary"
+        android:entries="@array/settings_provider_names"
+        android:entryValues="@array/settings_provider_values"
+        android:defaultValue="gps" />
+	
     <CheckBoxPreference
         android:key="debug"
         android:title="@string/settings_debug_title"
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 697fda6..99d7767 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -26,6 +26,14 @@
         android:numeric="integer"
         android:defaultValue="60" />
 
+	<ListPreference
+        android:key="provider"
+        android:title="@string/settings_provider_title"
+        android:summary="@string/settings_provider_summary"
+        android:entries="@array/settings_provider_names"
+        android:entryValues="@array/settings_provider_values"
+        android:defaultValue="gps" />
+
     <CheckBoxPreference
         android:key="debug"
         android:title="@string/settings_debug_title"
diff --git a/src/org/traccar/client/TraccarActivity.java b/src/org/traccar/client/TraccarActivity.java
index 5dc9bc5..1a86269 100644
--- a/src/org/traccar/client/TraccarActivity.java
+++ b/src/org/traccar/client/TraccarActivity.java
@@ -38,6 +38,7 @@ public class TraccarActivity extends PreferenceActivity {
     public static final String KEY_ADDRESS = "address";
     public static final String KEY_PORT = "port";
     public static final String KEY_INTERVAL = "interval";
+    public static final String KEY_PROVIDER = "provider";
     public static final String KEY_DEBUG = "debug";
     public static final String KEY_STATUS = "status";
 
diff --git a/src/org/traccar/client/TraccarService.java b/src/org/traccar/client/TraccarService.java
index 4d2e4e3..2f30de1 100644
--- a/src/org/traccar/client/TraccarService.java
+++ b/src/org/traccar/client/TraccarService.java
@@ -36,6 +36,7 @@ public class TraccarService extends Service {
     private String address;
     private int port;
     private int interval;
+    private String provider;
 
     private SharedPreferences sharedPreferences;
     private ClientController clientController;
@@ -52,16 +53,17 @@ public class TraccarService extends Service {
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
+        id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
         address = sharedPreferences.getString(TraccarActivity.KEY_ADDRESS, null);
         port = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_PORT, null));
         interval = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_INTERVAL, null));
-        id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
+        provider = sharedPreferences.getString(TraccarActivity.KEY_PROVIDER, null);
 
         clientController = new ClientController(this, address, port, Protocol.createLoginMessage(id));
         clientController.start();
 
         locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval * 1000, 0, locationListener);
+        locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
 
         sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
 
@@ -111,32 +113,23 @@ public class TraccarService extends Service {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
             StatusActivity.addMessage(getString((R.string.status_preference_update)));
-
-            boolean serverChanged = false;
-
             if (key.equals(TraccarActivity.KEY_ADDRESS)) {
                 address = sharedPreferences.getString(TraccarActivity.KEY_ADDRESS, null);
-                serverChanged = true;
-            }
-
-            if (key.equals(TraccarActivity.KEY_PORT)) {
-                port = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_PORT, null));
-                serverChanged = true;
-            }
-
-            if (serverChanged) {
                 clientController.setNewServer(address, port);
-            }
-
-            if (key.equals(TraccarActivity.KEY_INTERVAL)) {
+            } 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);
-                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval * 1000, 0, locationListener);
-            }
-
-            if (key.equals(TraccarActivity.KEY_ID)) {
+                locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
+            } 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);
+                locationManager.requestLocationUpdates(provider, interval * 1000, 0, locationListener);
             }
         }