add preference settings for connection retries

3 files changed, 195 insertions, 186 deletions

diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
index fc97751..58b4ede 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
@@ -157,10 +157,12 @@ public class BlueetoothGpsManager {
 	private Notification serviceStoppedNotification;

 	private Context appContext;

 	private NotificationManager notificationManager;

-	

-	public BlueetoothGpsManager(Service callingService, String deviceAddress) {

+	private int maxConnectionRetries;

+

+	public BlueetoothGpsManager(Service callingService, String deviceAddress, int maxRetries) {

 		this.gpsDeviceAddress = deviceAddress;

 		this.callingService = callingService;

+		this.maxConnectionRetries = maxRetries;

 		this.appContext = callingService.getApplicationContext();

 		locationManager = (LocationManager)callingService.getSystemService(Context.LOCATION_SERVICE);

 		notificationManager = (NotificationManager)callingService.getSystemService(Context.NOTIFICATION_SERVICE);

@@ -177,7 +179,10 @@ public class BlueetoothGpsManager {
 		serviceStoppedNotification.icon=R.drawable.icon;

 		Intent restartIntent = new Intent(BluetoothGpsProviderService.ACTION_START_GPS_PROVIDER);

 		PendingIntent restartPendingIntent = PendingIntent.getService(appContext, 0, restartIntent, PendingIntent.FLAG_CANCEL_CURRENT);

-		serviceStoppedNotification.setLatestEventInfo(appContext, appContext.getString(R.string.service_closed_because_connection_problem_notification_title), appContext.getString(R.string.service_closed_because_connection_problem_notification_title), restartPendingIntent);

+		serviceStoppedNotification.setLatestEventInfo(appContext, 

+				appContext.getString(R.string.service_closed_because_connection_problem_notification_title), 

+				appContext.getString(R.string.service_closed_because_connection_problem_notification), 

+				restartPendingIntent);

 

 

 	}

@@ -268,7 +273,7 @@ public class BlueetoothGpsManager {
 									}

 									// if bluetooth has bean disabled or

 									// if two much tries consider that we are enable to connect. So close everything and get out

-									if ((!bluetoothAdapter.isEnabled()) || (connectionTry >= 5 )){

+									if ((!bluetoothAdapter.isEnabled()) || (connectionTry >= maxConnectionRetries )){

 										notificationManager.cancel(R.string.connection_problem_notification_title);

 										serviceStoppedNotification.when = System.currentTimeMillis();

 										notificationManager.notify(R.string.service_closed_because_connection_problem_notification_title, serviceStoppedNotification);

diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
index d12782e..f5f936e 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
@@ -1,181 +1,183 @@
-/*
- * Copyright (C) 2010 Herbert von Broeuschmeul
- * Copyright (C) 2010 BluetoothGPS4Droid Project
- * 
- * This file is part of BluetoothGPS4Droid.
- *
- * BluetoothGPS4Droid is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * BluetoothGPS4Droid is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with BluetoothGPS4Droid. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.broeuschmeul.android.gps.bluetooth.provider;
-
-import java.util.Set;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.util.Log;
-
-/**
- * A PreferenceActivity Class used to configure, start and stop the NMEA tracker service.
- * 
- * @author Herbert von Broeuschmeul
- *
- */
-public class BluetoothGpsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnSharedPreferenceChangeListener {
-	private SharedPreferences sharedPref ;
-	private BluetoothAdapter bluetoothAdapter = null;
-
-	/** Called when the activity is first created. */
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(R.xml.pref);      
-		sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-		sharedPref.registerOnSharedPreferenceChangeListener(this);
-		bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-	}
-
-	/* (non-Javadoc)
-	 * @see android.app.Activity#onResume()
-	 */
-	@Override
-	protected void onResume() {
-		this.updateDevicePreferenceList();
-		super.onResume();
-	}
-
-	private void updateDevicePreferenceSummary(){
-		// update bluetooth device summary
-		String deviceName = "";
-		ListPreference prefDevices = (ListPreference)findPreference(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE);
-		String deviceAddress = sharedPref.getString(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE, null);
-		if (BluetoothAdapter.checkBluetoothAddress(deviceAddress)){
-			deviceName = bluetoothAdapter.getRemoteDevice(deviceAddress).getName();
-		}
-		prefDevices.setSummary(getString(R.string.pref_bluetooth_device_summary, deviceName));
-	}   
-
-	private void updateDevicePreferenceList(){
-		// update bluetooth device summary
-		updateDevicePreferenceSummary();
-		// update bluetooth device list
-		ListPreference prefDevices = (ListPreference)findPreference(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE);
-		Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();        
-		String[] entryValues = new String[pairedDevices.size()];
-		String[] entries = new String[pairedDevices.size()];
-		int i = 0;
-		// Loop through paired devices
-		for (BluetoothDevice device : pairedDevices) {
-			// Add the name and address to the ListPreference enties and entyValues
-			Log.e("BT test", "device: "+device.getName() + " -- " + device.getAddress());
-			entryValues[i] = device.getAddress();
-			entries[i] = device.getName();
-			i++;
-		}
-		prefDevices.setEntryValues(entryValues);
-		prefDevices.setEntries(entries);
-		Preference pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_TRACK_RECORDING);
-		pref.setEnabled(sharedPref.getBoolean(BluetoothGpsProviderService.PREF_START_GPS_PROVIDER, false));
-		pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_MOCK_GPS_NAME);
-		String mockProvider = sharedPref.getString(BluetoothGpsProviderService.PREF_MOCK_GPS_NAME, getString(R.string.defaultMockGpsName));
-		pref.setSummary(getString(R.string.pref_mock_gps_name_summary,mockProvider));
-
-		pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_GPS_LOCATION_PROVIDER);
-		if (sharedPref.getBoolean(BluetoothGpsProviderService.PREF_REPLACE_STD_GPS, true)){
-			String s = getString(R.string.pref_gps_location_provider_summary);
-			pref.setSummary(s);
-			Log.e("BT test", "loc. provider: "+s);
-			Log.e("BT test", "loc. provider: "+pref.getSummary());               	
-		} else {
-			String s = getString(R.string.pref_mock_gps_name_summary, mockProvider);
-			pref.setSummary(s);
-			Log.e("BT test", "loc. provider: "+s);
-			Log.e("BT test", "loc. provider: "+pref.getSummary());  
-		} 
-		this.onContentChanged();
-	}
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		sharedPref.unregisterOnSharedPreferenceChangeListener(this);
-	}
-
-	@Override
-	public boolean onPreferenceChange(Preference preference, Object newValue) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-			String key) {
-		if (BluetoothGpsProviderService.PREF_START_GPS_PROVIDER.equals(key)){
-			boolean val = false;
-			if (val = sharedPreferences.getBoolean(key, false)){
-				startService(new Intent(BluetoothGpsProviderService.ACTION_START_GPS_PROVIDER));
-			} else {
-				startService(new Intent(BluetoothGpsProviderService.ACTION_STOP_GPS_PROVIDER));
-			}
-			CheckBoxPreference pref = (CheckBoxPreference)findPreference(key);
-			if (pref.isChecked() != val){
-				pref.setChecked(val);
-			}
-		} else if (BluetoothGpsProviderService.PREF_TRACK_RECORDING.equals(key)){
-			boolean val = false;
-			if (val = sharedPreferences.getBoolean(key, false)){
-				startService(new Intent(BluetoothGpsProviderService.ACTION_START_TRACK_RECORDING));
-			} else {
-				startService(new Intent(BluetoothGpsProviderService.ACTION_STOP_TRACK_RECORDING));
-			}
-			CheckBoxPreference pref = (CheckBoxPreference)findPreference(key);
-			if (pref.isChecked() != val){
-				pref.setChecked(val);
-			}
-		} else if (BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE.equals(key)){
-			updateDevicePreferenceSummary();
-		} else if (BluetoothGpsProviderService.PREF_SIRF_ENABLE_GLL.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_VTG.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_GSA.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_GSV.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_ZDA.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_SBAS.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_NMEA.equals(key)
-				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_STATIC_NAVIGATION.equals(key)
-		){
-			enableSirfFeature(key);
-		}	
-		this.updateDevicePreferenceList();
-	}	
-	private void enableSirfFeature(String key){
-		CheckBoxPreference pref = (CheckBoxPreference)(findPreference(key));
-		if (pref.isChecked() != sharedPref.getBoolean(key, false)){
-			pref.setChecked(sharedPref.getBoolean(key, false));
-		} else {
-			Intent configIntent = new Intent(BluetoothGpsProviderService.ACTION_CONFIGURE_SIRF_GPS);
-			configIntent.putExtra(key, pref.isChecked());
-			startService(configIntent);
-		}
-	}
-}
\ No newline at end of file
+/*

+ * Copyright (C) 2010 Herbert von Broeuschmeul

+ * Copyright (C) 2010 BluetoothGPS4Droid Project

+ * 

+ * This file is part of BluetoothGPS4Droid.

+ *

+ * BluetoothGPS4Droid is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ * 

+ * BluetoothGPS4Droid is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ * 

+ *  You should have received a copy of the GNU General Public License

+ *  along with BluetoothGPS4Droid. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+package org.broeuschmeul.android.gps.bluetooth.provider;

+

+import java.util.Set;

+

+import android.bluetooth.BluetoothAdapter;

+import android.bluetooth.BluetoothDevice;

+import android.content.Intent;

+import android.content.SharedPreferences;

+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

+import android.os.Bundle;

+import android.preference.CheckBoxPreference;

+import android.preference.ListPreference;

+import android.preference.Preference;

+import android.preference.PreferenceActivity;

+import android.preference.PreferenceManager;

+import android.preference.Preference.OnPreferenceChangeListener;

+import android.util.Log;

+

+/**

+ * A PreferenceActivity Class used to configure, start and stop the NMEA tracker service.

+ * 

+ * @author Herbert von Broeuschmeul

+ *

+ */

+public class BluetoothGpsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnSharedPreferenceChangeListener {

+	private SharedPreferences sharedPref ;

+	private BluetoothAdapter bluetoothAdapter = null;

+

+	/** Called when the activity is first created. */

+	@Override

+	public void onCreate(Bundle savedInstanceState) {

+		super.onCreate(savedInstanceState);

+		addPreferencesFromResource(R.xml.pref);      

+		sharedPref = PreferenceManager.getDefaultSharedPreferences(this);

+		sharedPref.registerOnSharedPreferenceChangeListener(this);

+		bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

+	}

+

+	/* (non-Javadoc)

+	 * @see android.app.Activity#onResume()

+	 */

+	@Override

+	protected void onResume() {

+		this.updateDevicePreferenceList();

+		super.onResume();

+	}

+

+	private void updateDevicePreferenceSummary(){

+		// update bluetooth device summary

+		String deviceName = "";

+		ListPreference prefDevices = (ListPreference)findPreference(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE);

+		String deviceAddress = sharedPref.getString(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE, null);

+		if (BluetoothAdapter.checkBluetoothAddress(deviceAddress)){

+			deviceName = bluetoothAdapter.getRemoteDevice(deviceAddress).getName();

+		}

+		prefDevices.setSummary(getString(R.string.pref_bluetooth_device_summary, deviceName));

+	}   

+

+	private void updateDevicePreferenceList(){

+		// update bluetooth device summary

+		updateDevicePreferenceSummary();

+		// update bluetooth device list

+		ListPreference prefDevices = (ListPreference)findPreference(BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE);

+		Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();        

+		String[] entryValues = new String[pairedDevices.size()];

+		String[] entries = new String[pairedDevices.size()];

+		int i = 0;

+		// Loop through paired devices

+		for (BluetoothDevice device : pairedDevices) {

+			// Add the name and address to the ListPreference enties and entyValues

+			Log.e("BT test", "device: "+device.getName() + " -- " + device.getAddress());

+			entryValues[i] = device.getAddress();

+			entries[i] = device.getName();

+			i++;

+		}

+        prefDevices.setEntryValues(entryValues);

+        prefDevices.setEntries(entries);

+        Preference pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_TRACK_RECORDING);

+        pref.setEnabled(sharedPref.getBoolean(BluetoothGpsProviderService.PREF_START_GPS_PROVIDER, false));

+        pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_MOCK_GPS_NAME);

+        String mockProvider = sharedPref.getString(BluetoothGpsProviderService.PREF_MOCK_GPS_NAME, getString(R.string.defaultMockGpsName));

+        pref.setSummary(getString(R.string.pref_mock_gps_name_summary,mockProvider));

+        pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_CONNECTION_RETRIES);

+        String maxConnRetries = sharedPref.getString(BluetoothGpsProviderService.PREF_CONNECTION_RETRIES, getString(R.string.defaultConnectionRetries));

+        pref.setSummary(getString(R.string.pref_connection_retries_summary,maxConnRetries));

+        pref = (Preference)findPreference(BluetoothGpsProviderService.PREF_GPS_LOCATION_PROVIDER);

+        if (sharedPref.getBoolean(BluetoothGpsProviderService.PREF_REPLACE_STD_GPS, true)){

+        	String s = getString(R.string.pref_gps_location_provider_summary);

+        	pref.setSummary(s);

+        	Log.e("BT test", "loc. provider: "+s);

+        	Log.e("BT test", "loc. provider: "+pref.getSummary());               	

+        } else {

+        	String s = getString(R.string.pref_mock_gps_name_summary, mockProvider);

+        	pref.setSummary(s);

+        	Log.e("BT test", "loc. provider: "+s);

+        	Log.e("BT test", "loc. provider: "+pref.getSummary());  

+        } 

+        this.onContentChanged();

+    }

+

+	@Override

+	protected void onDestroy() {

+		super.onDestroy();

+		sharedPref.unregisterOnSharedPreferenceChangeListener(this);

+	}

+

+	@Override

+	public boolean onPreferenceChange(Preference preference, Object newValue) {

+		// TODO Auto-generated method stub

+		return false;

+	}

+

+	@Override

+	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,

+			String key) {

+		if (BluetoothGpsProviderService.PREF_START_GPS_PROVIDER.equals(key)){

+			boolean val = false;

+			if (val = sharedPreferences.getBoolean(key, false)){

+				startService(new Intent(BluetoothGpsProviderService.ACTION_START_GPS_PROVIDER));

+			} else {

+				startService(new Intent(BluetoothGpsProviderService.ACTION_STOP_GPS_PROVIDER));

+			}

+			CheckBoxPreference pref = (CheckBoxPreference)findPreference(key);

+			if (pref.isChecked() != val){

+				pref.setChecked(val);

+			}

+		} else if (BluetoothGpsProviderService.PREF_TRACK_RECORDING.equals(key)){

+			boolean val = false;

+			if (val = sharedPreferences.getBoolean(key, false)){

+				startService(new Intent(BluetoothGpsProviderService.ACTION_START_TRACK_RECORDING));

+			} else {

+				startService(new Intent(BluetoothGpsProviderService.ACTION_STOP_TRACK_RECORDING));

+			}

+			CheckBoxPreference pref = (CheckBoxPreference)findPreference(key);

+			if (pref.isChecked() != val){

+				pref.setChecked(val);

+			}

+		} else if (BluetoothGpsProviderService.PREF_BLUETOOTH_DEVICE.equals(key)){

+			updateDevicePreferenceSummary();

+		} else if (BluetoothGpsProviderService.PREF_SIRF_ENABLE_GLL.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_VTG.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_GSA.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_GSV.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_ZDA.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_SBAS.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_NMEA.equals(key)

+				|| BluetoothGpsProviderService.PREF_SIRF_ENABLE_STATIC_NAVIGATION.equals(key)

+		){

+			enableSirfFeature(key);

+		}	

+		this.updateDevicePreferenceList();

+	}	

+	private void enableSirfFeature(String key){

+		CheckBoxPreference pref = (CheckBoxPreference)(findPreference(key));

+		if (pref.isChecked() != sharedPref.getBoolean(key, false)){

+			pref.setChecked(sharedPref.getBoolean(key, false));

+		} else {

+			Intent configIntent = new Intent(BluetoothGpsProviderService.ACTION_CONFIGURE_SIRF_GPS);

+			configIntent.putExtra(key, pref.isChecked());

+			startService(configIntent);

+		}

+	}

+}

diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
index 0d0c30b..47b5cf2 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
@@ -65,6 +65,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 	public static final String PREF_GPS_LOCATION_PROVIDER = "gpsLocationProviderKey";

 	public static final String PREF_REPLACE_STD_GPS = "replaceStdtGps";

 	public static final String PREF_MOCK_GPS_NAME = "mockGpsName";

+	public static final String PREF_CONNECTION_RETRIES = "connectionRetries";

 	public static final String PREF_TRACK_RECORDING = "trackRecording";

 	public static final String PREF_TRACK_MIN_DISTANCE = "trackMinDistance";

 	public static final String PREF_TRACK_MIN_TIME = "trackMinTime";

@@ -100,6 +101,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);

 		SharedPreferences.Editor edit = sharedPreferences.edit();

 		String deviceAddress = sharedPreferences.getString(PREF_BLUETOOTH_DEVICE, null);

+		int maxConRetries = Integer.parseInt(sharedPreferences.getString(PREF_CONNECTION_RETRIES, this.getString(R.string.defaultConnectionRetries)));

 		if (Config.LOGD){

 			Log.d(BluetoothGpsProviderService.class.getName(), "prefs device addr: "+deviceAddress);

 		}

@@ -114,7 +116,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 					if (! sharedPreferences.getBoolean(PREF_REPLACE_STD_GPS, true)){

 						mockProvider = sharedPreferences.getString(PREF_MOCK_GPS_NAME, getString(R.string.defaultMockGpsName));

 					}

-					gpsManager = new BlueetoothGpsManager(this, deviceAddress);

+					gpsManager = new BlueetoothGpsManager(this, deviceAddress, maxConRetries);

 					gpsManager.enableMockLocationProvider(mockProvider);

 					boolean enabled = gpsManager.enable();

 //					Bundle extras = intent.getExtras();