Clean up sendMessage calls

[fonbot.git] / src / ro / ieval / fonbot / SmsStatusReceiver.java

diff --git a/src/ro/ieval/fonbot/SmsStatusReceiver.java b/src/ro/ieval/fonbot/SmsStatusReceiver.java
index 30809ae3189745c6c93cf8ac9198398f0e85cdb0..59a96a56a54a3247d4ff72f9eaa53a900d95b901 100644 (file)
--- a/src/ro/ieval/fonbot/SmsStatusReceiver.java
+++ b/src/ro/ieval/fonbot/SmsStatusReceiver.java
@@ -1,5 +1,6 @@
 package ro.ieval.fonbot;
 
+import static ro.ieval.fonbot.R.string.*;
 import org.eclipse.jdt.annotation.Nullable;
 
 import android.app.Activity;
@@ -40,8 +41,8 @@ public final class SmsStatusReceiver extends BroadcastReceiver {
         * @return the string representation of the SMS
         */
        private static String describeSMS(final Intent intent){
-               return " ("+"To: "+intent.getStringExtra(EXTRA_DESTINATION)+
-                               ", Part: "+intent.getIntExtra(EXTRA_PART, 1)+" of "+intent.getIntExtra(EXTRA_TOTAL, 1)+")";
+               return "To: "+intent.getStringExtra(EXTRA_DESTINATION)+
+                               ", Part: "+intent.getIntExtra(EXTRA_PART, 1)+" of "+intent.getIntExtra(EXTRA_TOTAL, 1);
        }
 
        /**
@@ -77,28 +78,28 @@ public final class SmsStatusReceiver extends BroadcastReceiver {
                if(intent.getAction().startsWith(SENT_ACTION))
                        switch(getResultCode()){
                        case Activity.RESULT_OK:
-                               Utils.sendMessage(context, replyTo, "SMS sent"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_sent, describeSMS(intent));
                                break;
                        case SmsManager.RESULT_ERROR_GENERIC_FAILURE:
-                               Utils.sendMessage(context, replyTo, "SMS not sent: Generic failure"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_not_sent_generic_failure, describeSMS(intent));
                                break;
                        case SmsManager.RESULT_ERROR_NO_SERVICE:
-                               Utils.sendMessage(context, replyTo, "SMS not sent: No service"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_not_sent_no_service, describeSMS(intent));
                                break;
                        case SmsManager.RESULT_ERROR_NULL_PDU:
-                               Utils.sendMessage(context, replyTo, "SMS not sent: Null PDU"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_not_sent_null_pdu, describeSMS(intent));
                                break;
                        case SmsManager.RESULT_ERROR_RADIO_OFF:
-                               Utils.sendMessage(context, replyTo, "SMS not sent: Radio off"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_not_sent_radio_off, describeSMS(intent));
                                break;
                        }
                else if(intent.getAction().startsWith(DELIVERED_ACTION))
                        switch(getResultCode()){
                        case Activity.RESULT_OK:
-                               Utils.sendMessage(context, replyTo, "SMS delivered"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_delivered, describeSMS(intent));
                                break;
                        case Activity.RESULT_CANCELED:
-                               Utils.sendMessage(context, replyTo, "SMS not delivered"+describeSMS(intent));
+                               Utils.sendMessage(context, replyTo, sms_not_delivered, describeSMS(intent));
                                break;
                        }
        }