Replace GCM and polling with long polling

[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 c4f3615a8313a318ffad513fcbbceb214c7838d0..8548404aa2b62ae1af196f02287313dfe459c1d1 100644 (file)
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -86,7 +86,8 @@ public final class Utils {
                NEXT, PREV, BATT, CALLLOG, SMSLOG,
                LS, RM, CONTACTS, DISABLE, ENABLE,
                POLL, HANGUP, ANSWER, LAUNCH, DATA,
-               GPS, GLOCATION, REBOOT, SHUTDOWN, NOTIFY
+               GPS, GLOCATION, REBOOT, NOTIFY, SCREENCAP,
+               TORCH
        }
 
        /**
@@ -109,7 +110,9 @@ public final class Utils {
                /** Fine battery status notifications */
                BATTERY_CHANGED,
                /** Headset plug/unplug notifications */
-               HEADSET
+               HEADSET,
+               /** Phone booted notifications */
+               BOOT,
        }
 
        /**
@@ -181,9 +184,7 @@ public final class Utils {
                /** Location tracking is active. Registered by {@link Command#LOCATION}, unregistered by {@link Command#NOLOCATION} */
                LOCATION(location_tracking_is_active),
                /** The phone is ringing. Registered/unregistered by {@link Command#RING} */
-               RING(ringing),
-               /** The polling alarm is on. Registered/unregistered by {@link Command#POLL} */
-               POLL(the_polling_service_is_running);
+               RING(ringing);
 
                /** String resource: the event description */
                public final int resource;
@@ -405,30 +406,11 @@ public final class Utils {
         */
        public static URL getServerURL(final Context context, final String path) throws MalformedURLException{
                final String hostname=PreferenceManager.getDefaultSharedPreferences(context).getString("hostname", "fonbot.ieval.ro");
-               final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "7777"));
-               final URL url=new URL("https", hostname, port, path);
+               final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "443"));
+               final URL url=new URL("http", hostname, port, path);
                return url;
        }
 
-       /**
-        * Poll the server for pending commands. This function must not be called from BroadcastReceivers
-        *
-        * @param context Context instance
-        */
-       public static void pollServer(final Context context){
-               new HttpCallExecutableRunnable("/get", null, context, new PollResultCallback(context), false).execute();
-       }
-
-       /**
-        * Poll the server for pending commands from {@link FonBotMainService}. This function should be used from BroadcastReceviers instead of {@link #pollServer}
-        *
-        * @param context Context instance
-        */
-       public static void safePollServer(final Context context){
-               final Intent intent=new Intent(context, FonBotMainService.class);
-               intent.setAction(FonBotMainService.ACTION_TRIGGER_POLL);
-               context.startService(intent);
-       }
        /**
         * Executes a given command
         *
@@ -904,25 +886,7 @@ public final class Utils {
                        break;
 
                case POLL:
-                       if(args.length>1){
-                               Heavy.help(context, replyTo, toNonNull(Command.POLL));
-                               break;
-                       }
-
-                       if(args.length==0){
-                               Heavy.poll(context, replyTo);
-                               break;
-                       }
-
-                       final long interval;
-                       try{
-                               interval=Long.parseLong(args[0]);
-                       } catch(NumberFormatException e){
-                               sendMessage(context, replyTo, cannot_parse_interval);
-                               break;
-                       }
-
-                       Heavy.poll(context, replyTo, interval);
+                       Heavy.poll(context, replyTo);
                        break;
 
                case HANGUP:
@@ -1003,10 +967,6 @@ public final class Utils {
                        Heavy.reboot(context, replyTo, args.length==0?null:args[0]);
                        break;
 
-               case SHUTDOWN:
-                       //TODO: implement command
-                       break;
-
                case NOTIFY:
                        if(args.length!=1 && args.length!=3){
                                Heavy.help(context, replyTo, toNonNull(Command.NOTIFY));
@@ -1026,6 +986,19 @@ public final class Utils {
                        else
                                Heavy.notify(context, replyTo, id, toNonNull(args[1]), toNonNull(args[2]));
                        break;
+
+               case SCREENCAP:
+                       if(args.length != 1){
+                               Heavy.help(context, replyTo, toNonNull(Command.SCREENCAP));
+                               return;
+                       }
+
+                       Heavy.screencap(context, replyTo, args[0]);
+                       break;
+
+               case TORCH:
+                       Heavy.torch(context, replyTo);
+                       break;
                }
 
        }