Clean up sendMessage calls

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

diff --git a/src/ro/ieval/fonbot/Heavy.java b/src/ro/ieval/fonbot/Heavy.java
index 8fa72677a31461728dbd49e0dd6e437634f11d8c..3eb17a875685c1fe75ac9881bdd6a29b7109883f 100644 (file)
--- a/src/ro/ieval/fonbot/Heavy.java
+++ b/src/ro/ieval/fonbot/Heavy.java
@@ -337,7 +337,7 @@ final class Heavy {
                        try{
                                sock = SocketChannel.open(new InetSocketAddress(hostname, port));
                        } catch (final IOException e){
-                               Utils.sendMessage(context, replyTo, toNonNull(context.getString(cannot_connect_to_host_on_port, hostname, Integer.valueOf(port))));
+                               Utils.sendMessage(context, replyTo, cannot_connect_to_host_on_port, hostname, Integer.valueOf(port));
                                try {
                                        in.close();
                                } catch (IOException ex) {
@@ -349,7 +349,7 @@ final class Heavy {
                        try{
                                in.transferTo(0, in.size(), sock);
                        } catch (final IOException e){
-                               Utils.sendMessage(context, replyTo, toNonNull(context.getString(io_error, e.getMessage())));
+                               Utils.sendMessage(context, replyTo, io_error, e.getMessage());
                        } finally {
                                try{
                                        in.close();
@@ -410,7 +410,7 @@ final class Heavy {
                                sock = new Socket(hostname, port);
                                in = sock.getInputStream();
                        } catch (final IOException e){
-                               Utils.sendMessage(context, replyTo, toNonNull(context.getString(cannot_connect_to_host_on_port, hostname, Integer.valueOf(port))));
+                               Utils.sendMessage(context, replyTo, cannot_connect_to_host_on_port, hostname, Integer.valueOf(port));
                                try {
                                        out.close();
                                } catch (IOException ex) {
@@ -425,7 +425,7 @@ final class Heavy {
                                while((nread = in.read(buffer)) > 0)
                                        out.write(buffer, 0, nread);
                        } catch (final IOException e){
-                               Utils.sendMessage(context, replyTo, toNonNull(context.getString(io_error, e.getMessage())));
+                               Utils.sendMessage(context, replyTo, io_error, e.getMessage());
                        } finally {
                                try{
                                        out.close();
@@ -634,6 +634,9 @@ final class Heavy {
                case SMS:
                        Utils.sendMessage(context, replyTo, sms_help);
                        break;
+               case SMSQ:
+                       Utils.sendMessage(context, replyTo, smsq_help);
+                       break;
                case SMSLOG:
                        Utils.sendMessage(context, replyTo, smslog_help);
                        break;
@@ -1002,10 +1005,10 @@ final class Heavy {
                                        CommonDataKinds.Phone.LABEL);
 
                        while(inCursor.moveToNext())
-                               Utils.sendMessage(context, replyTo, toNonNull(context.getString(contact_info,
+                               Utils.sendMessage(context, replyTo, contact_info,
                                                cursor.getString(0),
                                                inCursor.getString(0),
-                                               phoneNumberType(context, inCursor.getInt(1), inCursor.getString(2)))));
+                                               phoneNumberType(context, inCursor.getInt(1), inCursor.getString(2)));
 
                        inCursor.close();
                }
@@ -1418,7 +1421,7 @@ final class Heavy {
         * @param destination destination phone number
         * @param text text message contents
         */
-       public static void sms(final Context context, final Address replyTo, final String destination, final String text){
+       public static void sms(final Context context, final Address replyTo, final String destination, final String text, final boolean quiet){
                final SmsManager manager=SmsManager.getDefault();
                final ArrayList<String> messages=manager.divideMessage(text);
                if(messages.size() > 1)
@@ -1453,7 +1456,7 @@ final class Heavy {
                }
 
                Log.d(Heavy.class.getName(), "Sending sms to "+destination);
-               manager.sendMultipartTextMessage(destination, null, messages, sents, delivereds);
+               manager.sendMultipartTextMessage(destination, null, messages, sents, quiet ? null : delivereds);
        }
 
        /**