[say-my-texts] branch develop updated (a7f1add -> 77db3fd)
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 a7f1add [maven-release-plugin] prepare for next development iteration new 77db3fd fixes #1057 Remove setting to block the '=' sms use pom instead of mavenpom 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 77db3fd9f7ced12d4cb9e337f472ab1465e786e3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 25 19:50:10 2014 +0200 fixes #1057 Remove setting to block the '=' sms use pom instead of mavenpom Summary of changes: pom.xml | 8 ++++---- res/values-fr/strings.xml | 1 - res/values/preference_keys.xml | 1 - res/values/strings.xml | 1 - res/xml/preferences.xml | 4 ---- .../chorem/android/saymytexts/NewTextBroadcastReceiver.java | 12 ------------ src/org/chorem/android/saymytexts/SettingsActivity.java | 5 ----- 7 files changed, 4 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 77db3fd9f7ced12d4cb9e337f472ab1465e786e3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 25 19:50:10 2014 +0200 fixes #1057 Remove setting to block the '=' sms use pom instead of mavenpom --- pom.xml | 8 ++++---- res/values-fr/strings.xml | 1 - res/values/preference_keys.xml | 1 - res/values/strings.xml | 1 - res/xml/preferences.xml | 4 ---- .../chorem/android/saymytexts/NewTextBroadcastReceiver.java | 12 ------------ src/org/chorem/android/saymytexts/SettingsActivity.java | 5 ----- 7 files changed, 4 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 4a9faa6..a5baa82 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> + <artifactId>chorempom</artifactId> + <version>1.2</version> </parent> <groupId>org.chorem.android</groupId> @@ -76,8 +76,8 @@ <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ed45a9d..ce8009d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -14,7 +14,6 @@ <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 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/preference_keys.xml b/res/values/preference_keys.xml index 93f7ac6..43006d2 100644 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@ -4,7 +4,6 @@ <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 35898d2..646e2c7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -14,7 +14,6 @@ <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 \"=\" 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 79c24cb..742a108 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -24,10 +24,6 @@ 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 5dd1eb6..6260f34 100644 --- a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java @@ -70,18 +70,6 @@ public class NewTextBroadcastReceiver extends BroadcastReceiver { messageReceived += msgs[i].getDisplayMessageBody() + " "; } - // check if the message is '=' to avoid restart the phone - if ("=".equals(messageReceived.trim())) { - 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); diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index 6e6232b..6266d1f 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -156,11 +156,6 @@ public class SettingsActivity extends Activity { preference.setSummary(String.valueOf(maxAttemptNumber)); preference.setEnabled(interactionEnabled); - key = getString(R.string.preference_enable_heisendroid_mode_key); - switchPreference = (SwitchPreference) findPreference(key); - 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()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm