This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Say My Texts. commit 88a50473a86aace2b7e9de0fc80778e14b4ebb3e Author: kmorin <kmorin@2d65e43e-0f24-4770-8739-84cc4fd997b9> Date: Sat Apr 26 20:02:37 2014 +0000 fixes #1009 [Settings] Enable the answer to a sms --- res/values-fr/strings.xml | 1 + res/values/preference_keys.xml | 1 + res/values/strings.xml | 1 + res/xml/preferences.xml | 4 ++++ src/org/chorem/android/saymytexts/SayMyTextService.java | 7 ++++++- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 13c2e6d..6ecfea7 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -8,6 +8,7 @@ <!-- Preferences --> <string name="preferences_settings_label">Paramètres</string> <string name="preference_enable_reading_label">Lecture des SMS</string> + <string name="preference_enable_interaction_label">Intéraction (appel ou réponse)</string> <string name="preference_enable_heisendroid_mode_label">Mode Heisendroid</string> <string name="preference_test_sms_label">Tester en m\'envoyant un SMS</string> <string name="test_sms_content">Heisendroïd</string> diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml index 2fe1b9b..b10ea17 100644 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="preference_enable_reading_key">enable_reading</string> + <string name="preference_enable_interaction_key">enable_interaction</string> <string name="preference_enable_heisendroid_mode_key">enable_heisendroid_mode</string> <string name="preference_test_sms_key">test_sms</string> <string name="preference_version_key">version</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index bd0f4c1..ffdde79 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8,6 +8,7 @@ <!-- Preferences --> <string name="preferences_settings_label">Settings</string> <string name="preference_enable_reading_label">SMS reading</string> + <string name="preference_enable_interaction_label">Interaction (call or answer)</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> <string name="preference_test_sms_label">Test by sending an SMS to myself</string> <string name="test_sms_content">Heisendroïd</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 972d6fb..1c6e89a 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -8,6 +8,10 @@ android:title="@string/preference_enable_reading_label" android:defaultValue="true" /> + <SwitchPreference android:key="@string/preference_enable_interaction_key" + android:title="@string/preference_enable_interaction_label" + android:defaultValue="true" /> + <SwitchPreference android:key="@string/preference_enable_heisendroid_mode_key" android:title="@string/preference_enable_heisendroid_mode_label" android:defaultValue="false" /> diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index 8dd2d7a..aceb047 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -384,7 +384,12 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak("You're goddamn right.", TextToSpeech.QUEUE_ADD, params); } - askForActionAfterReading(sms, btConnected, 1); + String interactionPrefKey = getString(R.string.preference_enable_interaction_key); + if (sharedPref.getBoolean(interactionPrefKey, true)) { + askForActionAfterReading(sms, btConnected, 1); + } else { + setCanSpeak(true); + } } protected void askForActionAfterReading(final SMS sms, boolean btConnected, final int attemptNumber) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.