add preference settings for connection retries

3 files changed, 17 insertions, 21 deletions

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6923da6..6cbb744 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,14 +29,12 @@
     <string name="pref_replace_std_gps_summary_off">Un nouveau location provider sera utilisé</string>

     <string name="pref_mock_gps_name_title">Nom du location provider</string>

     <string name="pref_mock_gps_name_summary">Nom du GPS Bluetooth : %s</string>

+    <string name="pref_connection_retries_title">Nombre de connexions</string>

+    <string name="pref_connection_retries_summary">"Nombre d'essais avant fermeture : %s"</string>

     <string name="pref_recording_title">Activer/Désactiver NMEA log</string>

     <string name="pref_recording_summary_off">Enregistrement du GPS inactif</string>

     <string name="pref_recording_summary_on">Enregistrement du GPS actif</string>

     <string name="pref_recording_params_title">"Paramètres d'enregistrement"</string>

-    <string name="pref_mintime_title">Intervalle de temps</string>

-    <string name="pref_mintime_summary">Durée entre les données GPS en millisecondes</string>

-    <string name="pref_mindistance_title">Intervalle de distance</string>

-    <string name="pref_mindistance_summary">Distance entre les données GPS en metres</string>

     <string name="pref_trackfile_prefix_title">Préfixe</string>

     <string name="pref_trackfile_prefix_summary">Indiquer un préfixe pour les fichiers de traces</string>

     <string name="pref_trackfile_directory_title">Dossier</string>

@@ -55,12 +53,9 @@
     <string name="foreground_nmea_recording_started_notification">Enregistrement des données NMEA en cours.</string>

     <string name="connection_problem_notification_title">BlueGps : problème de connexion</string>

     <plurals name="connection_problem_notification">

-    	<item quantity="one">"encore un essai avant fermeture"</item>

-    	<item quantity="other">"encore %d essais avant fermeture"</item>

+    	<item quantity="one">"Encore un essai avant fermeture"</item>

+    	<item quantity="other">"Encore %d essais avant fermeture"</item>

     </plurals>

-    <!-- 

-    <string name="connection_problem_notification">Have tried %d times - will retry %d more times</string>

-    -->

     <string name="service_closed_because_connection_problem_notification_title">BlueGps arrêté</string>

-    <string name="service_closed_because_connection_problem_notification">Motif: problèmes de connexion avec le GPS</string>

+    <string name="service_closed_because_connection_problem_notification">Motif : problèmes de connexion</string>

 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a6fea9..3da0241 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,13 +24,13 @@
     <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>

     <string name="pref_replace_std_gps_key">replaceStdtGps</string>

     <string name="pref_mock_gps_name_key">mockGpsName</string>

+    <string name="pref_connection_retries_key">connectionRetries</string>

     <string name="pref_recording_key">trackRecording</string>

     <string name="pref_trackfile_directory_key">trackFileDirectory</string>

     <string name="pref_trackfile_prefix_key">trackFilePrefix</string>

     <string name="pref_bluetooth_device_key">bluetoothDevice</string>

 

-    <string name="defaultTrackMinDistance">0.0</string>

-    <string name="defaultTrackMinTime">0</string>

+    <string name="defaultConnectionRetries">5</string>

     <string name="defaultTrackFileDirectory">/sdcard/nmea</string>

     <string name="defaultTrackFilePrefix">btnmeatrack</string>

     <string name="defaultMockGpsName">bluetooth_gps</string>

@@ -48,14 +48,12 @@
     <string name="pref_replace_std_gps_summary_off">Bluetooth GPS will use a new location provider</string>

     <string name="pref_mock_gps_name_title">Mock location provider name</string>

     <string name="pref_mock_gps_name_summary">Bluetooth GPS name: %s</string>

+    <string name="pref_connection_retries_title">Connection retry number</string>

+    <string name="pref_connection_retries_summary">Number of attempts before exiting: %s</string>

     <string name="pref_recording_title">Enable/Disable NMEA log</string>

     <string name="pref_recording_summary_off">Track recording is off</string>

     <string name="pref_recording_summary_on">Track recording is on</string>

     <string name="pref_recording_params_title">Recording parameters</string>

-    <string name="pref_mintime_title">Time between records</string>

-    <string name="pref_mintime_summary">Time between records in milliseconds</string>

-    <string name="pref_mindistance_title">Distance between records</string>

-    <string name="pref_mindistance_summary">Distance between records in meters</string>

     <string name="pref_trackfile_prefix_title">Trackfiles prefix</string>

     <string name="pref_trackfile_prefix_summary">Select the prefix for the track files</string>

     <string name="pref_trackfile_directory_title">Trackfiles directory</string>

@@ -74,12 +72,9 @@
     <string name="foreground_nmea_recording_started_notification">BlueGps NMEA recording service started</string>

     <string name="connection_problem_notification_title">BlueGps: connection problem</string>

     <plurals name="connection_problem_notification">

-    	<item quantity="one">will retry one more time before closing</item>

-    	<item quantity="other">will retry %d more times before closing</item>

+    	<item quantity="one">Will retry one more time before closing</item>

+    	<item quantity="other">Will retry %d more times before closing</item>

     </plurals>

-    <!-- 

-    <string name="connection_problem_notification">Have tried %d times - will retry %d more times</string>

-    -->

     <string name="service_closed_because_connection_problem_notification_title">BlueGps stopped</string>

     <string name="service_closed_because_connection_problem_notification">Reason: too many connection problems</string>

 </resources>

diff --git a/res/xml/pref.xml b/res/xml/pref.xml
index 1bede1a..f384034 100644
--- a/res/xml/pref.xml
+++ b/res/xml/pref.xml
@@ -53,6 +53,12 @@
 			android:title="@string/pref_mock_gps_name_title"

 			android:defaultValue="@string/defaultMockGpsName"

 			android:summary="@string/pref_mock_gps_name_summary" />

+		<EditTextPreference

+			android:key="@string/pref_connection_retries_key"

+			android:title="@string/pref_connection_retries_title"

+			android:defaultValue="@string/defaultConnectionRetries"

+			android:inputType="numberDecimal"

+			android:summary="@string/pref_connection_retries_summary" />

 	</PreferenceScreen>

 	<CheckBoxPreference

 		android:enabled="true"