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@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 @@ <!-- Preferences --> <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 @@ <!-- Preferences --> <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@chorem.org>.