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 e0c0bb8d330a36449439f9544665a4829fd32585 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 17 08:40:08 2014 +0200 refs #1036 Block the SMS whose content is only "=" remove guava dependency --- AndroidManifest.xml | 6 ++--- pom.xml | 8 +------ .../saymytexts/NewTextBroadcastReceiver.java | 26 +++++++++++++--------- .../android/saymytexts/SayMyTextService.java | 14 +++++++----- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9df3374..3708ea7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.chorem.android.saymytexts" - android:versionCode="5" - android:versionName="2.0.2" + android:versionCode="6" + android:versionName="2.1" android:description="@string/app_description" android:installLocation="auto"> @@ -41,7 +41,7 @@ <receiver android:name=".NewTextBroadcastReceiver" android:enabled="true"> - <intent-filter> + <intent-filter android:priority="42"> <action android:name="android.provider.Telephony.SMS_RECEIVED" /> <action android:name="android.bluetooth.device.action.ACL_CONNECTED" /> <action android:name="android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED" /> diff --git a/pom.xml b/pom.xml index 0e3ad5a..028c58c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem.android</groupId> <artifactId>saymytexts</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <packaging>apk</packaging> <name>Say My Texts</name> @@ -155,12 +155,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guavaVersion}</version> - </dependency> - - <dependency> <groupId>ch.acra</groupId> <artifactId>acra</artifactId> <version>4.5.0</version> diff --git a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java index d8db7f0..1c98151 100644 --- a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java @@ -68,16 +68,22 @@ public class NewTextBroadcastReceiver extends BroadcastReceiver { messageReceived += msgs[i].getDisplayMessageBody() + " "; } - // 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); + // 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); + } } } else { diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index 61b7c0c..a190072 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -40,7 +40,6 @@ import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Log; import android.widget.Toast; -import com.google.common.base.Function; import java.util.ArrayList; import java.util.HashMap; @@ -351,11 +350,10 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList if (bluetoothDevices.isEmpty()) { readText(sms, false); } else { - requestBluetoothSpeakingActivation(new Function<Void, Void>() { + requestBluetoothSpeakingActivation(new Function() { @Override - public Void apply(Void input) { + public void apply() { readText(sms, true); - return null; } }); } @@ -365,14 +363,14 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList * Starts the connection with the bluetooth device and requests the reading * @param callback the function called when the bluetooth is ready */ - protected void requestBluetoothSpeakingActivation(final Function<Void, Void> callback) { + protected void requestBluetoothSpeakingActivation(final Function callback) { registerReceiver(new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { int state = intent.getExtras().getInt(AudioManager.EXTRA_SCO_AUDIO_STATE); if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) { context.unregisterReceiver(this); - callback.apply(null); + callback.apply(); } } }, new IntentFilter(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)); @@ -596,4 +594,8 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList interactionEnabled = sharedPreferences.getBoolean(key, true); } } + + public interface Function { + void apply(); + } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.