- Say-my-texts-commits - mailman.cloud.codelutin.com

[say-my-texts] branch develop updated (31b09e7 -> 41e6e9e)
by chorem.org scm 22 Aug '14

22 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git from 31b09e7 upgrade versions new 41e6e9e [maven-release-plugin] prepare release say-my-texts-2.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 41e6e9e7f3bbd0db63390d7cb8778e58427e1f33 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Aug 22 08:35:43 2014 +0200 [maven-release-plugin] prepare release say-my-texts-2.1.1 Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[say-my-texts] branch develop updated (bcab8a0 -> 31b09e7)
by chorem.org scm 21 Aug '14

21 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git from bcab8a0 fixes #1056 Error when a bluetooth device connects new 31b09e7 upgrade versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 31b09e7451d6190cda670e536601f973154ee6a2 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 21 23:57:48 2014 +0200 upgrade versions Summary of changes: AndroidManifest.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[say-my-texts] branch develop updated (5eb96b1 -> bcab8a0)
by chorem.org scm 21 Aug '14

21 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git from 5eb96b1 [maven-release-plugin] prepare for next development iteration new bcab8a0 fixes #1056 Error when a bluetooth device connects The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bcab8a04b20c10c6138b8511c0bf66ee714ee4f8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 21 23:36:25 2014 +0200 fixes #1056 Error when a bluetooth device connects Summary of changes: .../android/saymytexts/NewTextBroadcastReceiver.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[ANN] - Say My Texts 2.1 released
by chorem.org Release Notification 21 Jun '14

21 Jun '14

The Say My Texts team is pleased to announce the saymytexts-2.1 release! Say My Texts is an Android application which reads out loud the SMS you receive. This is particulary useful when you are riding, running or driving. You also can reply to the sender by calling him or by dictating the reply. Documentation of the project can be found here: https://forge.chorem.org/projects/say-my-texts Changes ------- Changes in this version include: New features: o Block the SMS whose content is only "=" Issue: 1036. Thanks to Kevin Morin. Resolved by kmorin. Changes: o Remove guava lib Issue: 1037. Thanks to Kevin Morin. Resolved by kmorin. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Say My Texts team

1 0

01/01: [maven-release-plugin] prepare for next development iteration
by chorem.org scm 21 Jun '14

21 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 5eb96b141dc0dc1903675327bc25d11a188fecad Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Jun 21 13:21:40 2014 +0200 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a09a5e..4a9faa6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem.android</groupId> <artifactId>saymytexts</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> <packaging>apk</packaging> <name>Say My Texts</name> @@ -71,7 +71,7 @@ scm:git:https://git.chorem.org/say-my-texts.git </developerConnection> <url>http://gitweb.chorem.org/say-my-texts.git</url> - <tag>say-my-texts-2.1</tag> + <tag>HEAD</tag> </scm> <distributionManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: [maven-release-plugin] prepare release say-my-texts-2.1
by chorem.org scm 21 Jun '14

21 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 0570600762d09213aa0fbafe6e21114660631237 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Jun 21 13:21:35 2014 +0200 [maven-release-plugin] prepare release say-my-texts-2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 028c58c..1a09a5e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem.android</groupId> <artifactId>saymytexts</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <packaging>apk</packaging> <name>Say My Texts</name> @@ -71,7 +71,7 @@ scm:git:https://git.chorem.org/say-my-texts.git </developerConnection> <url>http://gitweb.chorem.org/say-my-texts.git</url> - <tag>HEAD</tag> + <tag>say-my-texts-2.1</tag> </scm> <distributionManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fixes #1038
by chorem.org scm 21 Jun '14

21 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit b0d04c9b2ed0f82a32fa5da4d66037e8f4ded26a Author: Kevin Morin <morin(a)codelutin.com> Date: Sat Jun 21 13:18:34 2014 +0200 fixes #1038 --- res/values-fr/strings.xml | 3 + res/values/strings.xml | 3 + .../android/saymytexts/SayMyTextService.java | 91 +++++++++++--------- .../chorem/android/saymytexts/SayMyTextsUtils.java | 99 ++++++++++++++++++++++ 4 files changed, 157 insertions(+), 39 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 2aaa3d3..ed45a9d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -31,6 +31,9 @@ <string name="texttospeech_init_error">Erreur lors de l\'initialisation de la synthèse vocale.</string> <string name="texttospeech_not_installed">L\'application a besoin d\'un moteur de synthèse vocale. Veuillez en installer un. </string> + <string name="konami_code">haut haut bas bas gauche droite gauche droite b a</string> + <string name="fs_song_url">https://www.gnu.org/music/free-software-song.fr.html</string> +  <string name="crash_toast_text">Erreur innatendue, préparation du rapport de bug</string> <string name="crash_dialog_title">Say My Texts a planté</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index c2b6d84..35898d2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,6 +31,9 @@ <string name="texttospeech_init_error">Error during text to speech initialization.</string> <string name="texttospeech_not_installed">The application needs a text to speech engine to work. Please install one.</string> + <string name="konami_code">up up down down left right left right b a</string> + <string name="fs_song_url">https://www.gnu.org/music/free-software-song.html</string> +  <string name="crash_toast_text">Ooooops ! the application crashed, but a report has been sent to my developer to help fix the issue !</string> <string name="crash_dialog_title">say My Texts has crashed</string> diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index a190072..3f1ed86 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -32,6 +32,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.media.AudioManager; +import android.net.Uri; import android.os.IBinder; import android.preference.PreferenceManager; import android.speech.tts.TextToSpeech; @@ -387,54 +388,66 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList // disable the reading of the nexts sms while reading the current one setCanSpeak(false); - textToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() { - @Override - public void onStart(String utteranceId) { - } + String message = sms.getMessage(); + if (message.trim().toLowerCase().equals(getString(R.string.konami_code))) { - @Override - public void onError(String utteranceId) { - Log.e(TAG, "Error speaking: " + utteranceId); - } + SayMyTextsUtils.playFSSong(); + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(getString(R.string.fs_song_url))); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + setCanSpeak(true); - @Override - public void onDone(String utteranceId) { - Log.d(TAG, "done"); - setCanSpeak(true); - } - }); + } else { + textToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() { + @Override + public void onStart(String utteranceId) { + } - HashMap<String, String> params = new HashMap<>(); - params.put(TextToSpeech.Engine.KEY_PARAM_STREAM, String.valueOf(AudioManager.STREAM_VOICE_CALL)); + @Override + public void onError(String utteranceId) { + Log.e(TAG, "Error speaking: " + utteranceId); + } - if (heisendroidModeEnabled) { - textToSpeech.setLanguage(Locale.US); - textToSpeech.setSpeechRate(0.3f); - textToSpeech.setPitch(0.1f); - textToSpeech.speak("Say my text.", TextToSpeech.QUEUE_ADD, params); - } + @Override + public void onDone(String utteranceId) { + Log.d(TAG, "done"); + setCanSpeak(true); + } + }); - if (!interactionEnabled && !heisendroidModeEnabled) { - params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); - } - textToSpeech.setLanguage(Locale.getDefault()); - textToSpeech.setSpeechRate(1f); - textToSpeech.setPitch(1f); - String text = getString(R.string.sms_received, sms.getSenderName(), sms.getMessage()); - textToSpeech.speak(text, TextToSpeech.QUEUE_ADD, params); + HashMap<String, String> params = new HashMap<>(); + params.put(TextToSpeech.Engine.KEY_PARAM_STREAM, String.valueOf(AudioManager.STREAM_VOICE_CALL)); - if (heisendroidModeEnabled) { - if (interactionEnabled) { + if (heisendroidModeEnabled) { + textToSpeech.setLanguage(Locale.US); + textToSpeech.setSpeechRate(0.3f); + textToSpeech.setPitch(0.1f); + textToSpeech.speak("Say my text.", TextToSpeech.QUEUE_ADD, params); + } + + if (!interactionEnabled && !heisendroidModeEnabled) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); } - textToSpeech.setLanguage(Locale.US); - textToSpeech.setSpeechRate(0.3f); - textToSpeech.setPitch(0.1f); - textToSpeech.speak("You're goddamn right.", TextToSpeech.QUEUE_ADD, params); - } + textToSpeech.setLanguage(Locale.getDefault()); + textToSpeech.setSpeechRate(1f); + textToSpeech.setPitch(1f); + String text = getString(R.string.sms_received, sms.getSenderName(), message); + textToSpeech.speak(text, TextToSpeech.QUEUE_ADD, params); - if (interactionEnabled) { - askForActionAfterReading(sms, btConnected, 1); + if (heisendroidModeEnabled) { + if (interactionEnabled) { + params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); + } + textToSpeech.setLanguage(Locale.US); + textToSpeech.setSpeechRate(0.3f); + textToSpeech.setPitch(0.1f); + textToSpeech.speak("You're goddamn right.", TextToSpeech.QUEUE_ADD, params); + } + + if (interactionEnabled) { + askForActionAfterReading(sms, btConnected, 1); + } } } diff --git a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java index fa9aeb3..c7c3c27 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java +++ b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java @@ -28,8 +28,12 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.media.AudioFormat; +import android.media.AudioManager; +import android.media.AudioTrack; import android.speech.RecognizerIntent; +import java.util.ArrayList; import java.util.List; /** @@ -45,4 +49,99 @@ public class SayMyTextsUtils { return activities.size() > 0; } + + public static final double QUAVER_DURATION = 0.25; + public static final double BLACK_DURATION = 0.5; + public static final double POINTED_BLACK_DURATION = 0.75; + + public static final int SAMPLE_RATE = 8000; + + public static final double G_FREQUENCY = 396; // hz + public static final double A_FREQUENCY = 440; // hz + public static final double B_FREQUENCY = 495; // hz + public static final double C_FREQUENCY = 528; // hz + public static final double D_FREQUENCY = 594; // hz + + private static final List<Byte> FS_SONG_NOTES = new ArrayList<>(); + + public static void playFSSong() { + if (FS_SONG_NOTES.isEmpty()) { + initFSSong(); + } + playSound(); + } + + private static void initFSSong() { + List<Double> tones = new ArrayList<>(); + + genTone(tones, D_FREQUENCY, BLACK_DURATION); + genTone(tones, C_FREQUENCY, QUAVER_DURATION); + genTone(tones, B_FREQUENCY, BLACK_DURATION); + genTone(tones, A_FREQUENCY, BLACK_DURATION); + genTone(tones, B_FREQUENCY, BLACK_DURATION); + genTone(tones, C_FREQUENCY, QUAVER_DURATION); + genTone(tones, B_FREQUENCY, BLACK_DURATION); + genTone(tones, A_FREQUENCY, BLACK_DURATION); + genTone(tones, G_FREQUENCY, BLACK_DURATION); + genTone(tones, G_FREQUENCY, POINTED_BLACK_DURATION); + genTone(tones, A_FREQUENCY, POINTED_BLACK_DURATION); + genTone(tones, B_FREQUENCY, QUAVER_DURATION); + genTone(tones, C_FREQUENCY, POINTED_BLACK_DURATION); + genTone(tones, B_FREQUENCY, BLACK_DURATION); + genTone(tones, B_FREQUENCY, QUAVER_DURATION); + genTone(tones, D_FREQUENCY, BLACK_DURATION); + + finalizeSample(tones); + } + + private static void genTone(List<Double> tones, double freqOfTone, double duration){ + // fill out the array + int numSample = (int) (duration * SAMPLE_RATE); + for (int i = 0; i < numSample; ++i) { + tones.add(Math.sin(2 * Math.PI * (tones.size()) / (SAMPLE_RATE / freqOfTone))); + } + + } + + private static void finalizeSample(List<Double> tones) { + // convert to 16 bit pcm sound array + // assumes the sample buffer is normalised. + int idx = 0; + for (final double dVal : tones) { + // scale to maximum amplitude + final short val = (short) ((dVal * 32767)); + // in 16 bit wav PCM, first byte is the low order byte + FS_SONG_NOTES.add((byte) (val & 0x00ff)); + FS_SONG_NOTES.add((byte) ((val & 0xff00) >>> 8)); + + } + } + + private static void playSound(){ + int size = FS_SONG_NOTES.size(); + final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, + SAMPLE_RATE, AudioFormat.CHANNEL_OUT_MONO, + AudioFormat.ENCODING_PCM_16BIT, size, + AudioTrack.MODE_STATIC); + + byte[] bytes = new byte[size]; + for (int i = 0 ; i < size ; i++) { + bytes[i] = FS_SONG_NOTES.get(i); + } + audioTrack.write(bytes, 0, size); + audioTrack.setPlaybackPositionUpdateListener(new AudioTrack.OnPlaybackPositionUpdateListener() { + @Override + public void onMarkerReached(AudioTrack track) { + } + + @Override + public void onPeriodicNotification(AudioTrack track) { + if (track.getPlayState() == AudioTrack.PLAYSTATE_STOPPED) { + audioTrack.release(); + } + } + }); + audioTrack.play(); + } + } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: refs #1034 [Settings] Error retrieving the user's phone number
by chorem.org scm 19 Jun '14

19 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit bb67b7791e1b46cdee7ca082c8b4c1f33d96067d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jun 19 21:29:11 2014 +0200 refs #1034 [Settings] Error retrieving the user's phone number --- src/org/chorem/android/saymytexts/SettingsActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index 1064320..6e6232b 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -224,8 +224,7 @@ public class SettingsActivity extends Activity { Context context = getActivity(); TelephonyManager tMgr = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); String phoneNumber = tMgr.getLine1Number(); -// sendSMS(phoneNumber); - sendSMS(null); + sendSMS(phoneNumber); } protected void sendSMS(String phoneNumber) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: refs #1034 [Settings] Error retrieving the user's phone number
by chorem.org scm 19 Jun '14

19 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 1e5818cd5163793bae6c3dbe47cf371354bf525b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jun 19 21:28:05 2014 +0200 refs #1034 [Settings] Error retrieving the user's phone number --- res/values-fr/strings.xml | 5 +++-- res/values/strings.xml | 5 +++-- res/xml/preferences.xml | 1 + .../android/saymytexts/SettingsActivity.java | 26 ++++++++++++---------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5792d2b..2aaa3d3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -10,10 +10,11 @@  <string name="preferences_settings_label">Paramètres</string> <string name="preference_reading_profile_label">Lecture des SMS</string> - <string name="preference_enable_interaction_label">Interaction (appel ou réponse)</string> + <string name="preference_enable_interaction_label">Interaction</string> + <string name="preference_enable_interaction_sublabel">appel ou réponse</string> <string name="preference_voice_recognizer_max_attempt_number_label">Nombre maximum d\'essais</string> <string name="preference_enable_heisendroid_mode_label">Mode Heisendroid</string> - <string name="preference_block_equals_sms_label">Bloque les SMSs "="</string> + <string name="preference_block_equals_sms_label">Bloque les SMS \"=\"</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/strings.xml b/res/values/strings.xml index 5cf4ed1..c2b6d84 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10,10 +10,11 @@  <string name="preferences_settings_label">Settings</string> <string name="preference_reading_profile_label">SMS reading</string> - <string name="preference_enable_interaction_label">Interaction (call or answer)</string> + <string name="preference_enable_interaction_label">Interaction</string> + <string name="preference_enable_interaction_sublabel">call or answer</string> <string name="preference_voice_recognizer_max_attempt_number_label">Maximum attempt number</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> - <string name="preference_block_equals_sms_label">Block the "=" SMSs</string> + <string name="preference_block_equals_sms_label">Block the \"=\" SMS</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 a669e1e..79c24cb 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -12,6 +12,7 @@ <SwitchPreference android:key="@string/preference_enable_interaction_key" android:title="@string/preference_enable_interaction_label" + android:summary="@string/preference_enable_interaction_sublabel" android:defaultValue="true" /> <EditTextPreference android:key="@string/preference_voice_recognizer_max_attempt_number_key" diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index b59ad7e..1064320 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -221,20 +221,24 @@ public class SettingsActivity extends Activity { } protected void sendSMS() { - final Context context = getActivity(); - - final String message = getString(R.string.test_sms_content); - - final PendingIntent pi = PendingIntent.getActivity(context, -1, new Intent(context, SettingsActivity.class), 0); - final SmsManager sms = SmsManager.getDefault(); - + Context context = getActivity(); TelephonyManager tMgr = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); String phoneNumber = tMgr.getLine1Number(); +// sendSMS(phoneNumber); + sendSMS(null); + } - if (phoneNumber != null) { + protected void sendSMS(String phoneNumber) { + Context context = getActivity(); + String message = getString(R.string.test_sms_content); + + PendingIntent pi = PendingIntent.getActivity(context, -1, new Intent(context, SettingsActivity.class), 0); + SmsManager sms = SmsManager.getDefault(); + + try { sms.sendTextMessage(phoneNumber, null, message, pi, null); - } else { + } catch (Exception e) { AlertDialog.Builder alert = new AlertDialog.Builder(context); alert.setTitle(R.string.preference_ask_phone_number_title); alert.setMessage(R.string.preference_ask_phone_number_message); @@ -246,9 +250,7 @@ public class SettingsActivity extends Activity { alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { String value = input.getText().toString(); - - sms.sendTextMessage(value, null, message, pi, null); - // Do something with value! + sendSMS(value); } }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fixes #1036 Block the SMS whose content is only "="
by chorem.org scm 18 Jun '14

18 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit c9584db0b4278f542268bf543bc29c039a2259a5 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jun 18 14:21:19 2014 +0200 fixes #1036 Block the SMS whose content is only "=" --- res/values-fr/strings.xml | 1 + res/values/preference_keys.xml | 1 + res/values/strings.xml | 1 + res/xml/preferences.xml | 4 +++ .../saymytexts/NewTextBroadcastReceiver.java | 34 +++++++++++++--------- .../android/saymytexts/SettingsActivity.java | 9 ++++-- 6 files changed, 35 insertions(+), 15 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f8c3754..5792d2b 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -13,6 +13,7 @@ <string name="preference_enable_interaction_label">Interaction (appel ou réponse)</string> <string name="preference_voice_recognizer_max_attempt_number_label">Nombre maximum d\'essais</string> <string name="preference_enable_heisendroid_mode_label">Mode Heisendroid</string> + <string name="preference_block_equals_sms_label">Bloque les SMSs "="</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 43006d2..93f7ac6 100644 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@ -4,6 +4,7 @@ <string name="preference_enable_interaction_key">enable_interaction</string> <string name="preference_enable_heisendroid_mode_key">enable_heisendroid_mode</string> <string name="preference_voice_recognizer_max_attempt_number_key">preference_voice_recognizer_max_attempt_number</string> + <string name="preference_block_equals_sms_key">preference_block_equals_sms_key</string> <string name="preference_test_sms_key">test_sms</string> <string name="preference_version_key">version</string> <string name="preference_documentation_key">documentation</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index d8792de..5cf4ed1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13,6 +13,7 @@ <string name="preference_enable_interaction_label">Interaction (call or answer)</string> <string name="preference_voice_recognizer_max_attempt_number_label">Maximum attempt number</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> + <string name="preference_block_equals_sms_label">Block the "=" SMSs</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 1afb239..a669e1e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -23,6 +23,10 @@ android:title="@string/preference_enable_heisendroid_mode_label" android:defaultValue="false"/> + <SwitchPreference android:key="@string/preference_block_equals_sms_key" + android:title="@string/preference_block_equals_sms_label" + android:defaultValue="false"/> + <Preference android:key="@string/preference_test_sms_key" android:title="@string/preference_test_sms_label" android:persistent="false"/> diff --git a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java index 1c98151..908c97f 100644 --- a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java @@ -30,9 +30,11 @@ import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; +import android.preference.PreferenceManager; import android.provider.BaseColumns; import android.provider.ContactsContract; import android.telephony.SmsMessage; @@ -70,20 +72,26 @@ public class NewTextBroadcastReceiver extends BroadcastReceiver { // check if the message is '=' to avoid restart the phone if ("=".equals(messageReceived.trim())) { - abortBroadcast(); - - } else { - // Get the Sender Phone Number - String senderPhoneNumber = msgs[0].getDisplayOriginatingAddress(); - String senderName = getContactDisplayNameByNumber(context, senderPhoneNumber); - SMS sms = new SMS(senderPhoneNumber, senderName, messageReceived); - - Log.d(TAG, messageReceived); - // start the service to say it out loud - serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_SMS, sms); - serviceIntent.setAction(SayMyTextService.ACTION_READ_SMS); - context.startService(serviceIntent); + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context); + String key = context.getString(R.string.preference_block_equals_sms_key); + boolean blockEqualsSms = sharedPref.getBoolean(key, false); + + if (blockEqualsSms) { + abortBroadcast(); + return; + } } + + // Get the Sender Phone Number + String senderPhoneNumber = msgs[0].getDisplayOriginatingAddress(); + String senderName = getContactDisplayNameByNumber(context, senderPhoneNumber); + SMS sms = new SMS(senderPhoneNumber, senderName, messageReceived); + + Log.d(TAG, messageReceived); + // start the service to say it out loud + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_SMS, sms); + serviceIntent.setAction(SayMyTextService.ACTION_READ_SMS); + context.startService(serviceIntent); } } else { diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index be81be4..b59ad7e 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -158,8 +158,13 @@ public class SettingsActivity extends Activity { key = getString(R.string.preference_enable_heisendroid_mode_key); switchPreference = (SwitchPreference) findPreference(key); - interactionEnabled = sharedPref.getBoolean(key, switchPreference.isChecked()); - switchPreference.setChecked(interactionEnabled); + enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(enabled); + + key = getString(R.string.preference_block_equals_sms_key); + switchPreference = (SwitchPreference) findPreference(key); + enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(enabled); sharedPref.registerOnSharedPreferenceChangeListener(this); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0