Author: kmorin Date: 2014-04-26 22:02:37 +0200 (Sat, 26 Apr 2014) New Revision: 45 Url: http://forge.chorem.org/projects/say-my-texts/repository/revisions/45 Log: fixes #1009 [Settings] Enable the answer to a sms Modified: trunk/res/values-fr/strings.xml trunk/res/values/preference_keys.xml trunk/res/values/strings.xml trunk/res/xml/preferences.xml trunk/src/org/chorem/android/saymytexts/SayMyTextService.java Modified: trunk/res/values/preference_keys.xml =================================================================== --- trunk/res/values/preference_keys.xml 2014-04-26 19:43:46 UTC (rev 44) +++ trunk/res/values/preference_keys.xml 2014-04-26 20:02:37 UTC (rev 45) @@ -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> Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-04-26 19:43:46 UTC (rev 44) +++ trunk/res/values/strings.xml 2014-04-26 20:02:37 UTC (rev 45) @@ -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> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-04-26 19:43:46 UTC (rev 44) +++ trunk/res/values-fr/strings.xml 2014-04-26 20:02:37 UTC (rev 45) @@ -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> Modified: trunk/res/xml/preferences.xml =================================================================== --- trunk/res/xml/preferences.xml 2014-04-26 19:43:46 UTC (rev 44) +++ trunk/res/xml/preferences.xml 2014-04-26 20:02:37 UTC (rev 45) @@ -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" /> Modified: trunk/src/org/chorem/android/saymytexts/SayMyTextService.java =================================================================== --- trunk/src/org/chorem/android/saymytexts/SayMyTextService.java 2014-04-26 19:43:46 UTC (rev 44) +++ trunk/src/org/chorem/android/saymytexts/SayMyTextService.java 2014-04-26 20:02:37 UTC (rev 45) @@ -384,7 +384,12 @@ 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) {