Merge SendHttpMessageAsyncTask and PollServerAsyncTask

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

diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index 117c528f6408d8cea153b5f665544009935329c0..e14095ea4695e4301b33215e64731786b77a561c 100644 (file)
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -316,8 +316,8 @@ public final class Utils {
        public static void sendMessage(final Context context, final Address address, final String message){
                switch(address.protocol){
                case HTTP:
-                       new SendHttpMessageAsyncTask(toNonNull(Arrays.asList(
-                                       new Header("X-Action", "SEND "+address.data))), context).execute(message);
+                       new HttpCallExecutableRunnable("/send", toNonNull(Arrays.asList(
+                                       new Header("X-Destination", toNonNull(address.data)))), context, null, message).execute();
                        break;
 
                case SMS:
@@ -345,6 +345,8 @@ public final class Utils {
                final int indexOfParen=message.indexOf(')');
                if(indexOfParen==-1)
                        return message;
+               if(indexOfParen == message.length()-1)
+                       return toNonNull(message.substring(1, indexOfParen));
                return toNonNull(message.substring(indexOfParen+2));
        }
 
@@ -423,6 +425,15 @@ public final class Utils {
                return url;
        }
 
+       /**
+        * Poll the server for pending commands.
+        *
+        * @param context Context instance
+        */
+       public static void pollServer(final Context context){
+               new HttpCallExecutableRunnable("/get", null, context, new PollResultCallback(context)).execute();
+       }
+
        /**
         * Executes a given command
         *