Fix reboot

[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 cac04f7a14f3130d300f274bf6f4bff862fdedd8..4dcd0fc4317723b6cc1740bb05bb1416f677d891 100644 (file)
--- a/src/ro/ieval/fonbot/Heavy.java
+++ b/src/ro/ieval/fonbot/Heavy.java
@@ -58,6 +58,7 @@ import android.os.BatteryManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
@@ -1237,16 +1238,16 @@ final class Heavy {
                new Thread(new Runnable() {
                        @Override
                        public void run() {
-                               try {
-                                       Thread.sleep(2000);
-                               } catch (InterruptedException e) {
-                                       //ignored
-                               }
+                               SystemClock.sleep(2000);
 
                                handler.post(new Runnable() {
                                        @Override
                                        public void run() {
-                                               camera.takePicture(null, null, new FonBotPictureCallback(context, replyTo, hostname, port));
+                                               try {
+                                                       camera.takePicture(null, null, new FonBotPictureCallback(context, replyTo, hostname, port));
+                                               } catch(Exception e){
+                                                       Utils.sendMessage(context, replyTo, error_while_processing_command, e.getClass().getName(), e.getMessage());
+                                               }
                                        }
                                });
                        }
@@ -1426,7 +1427,7 @@ final class Heavy {
                        sent.putExtra(SmsStatusReceiver.EXTRA_PART, i+1);
                        sent.putExtra(SmsStatusReceiver.EXTRA_TOTAL, messages.size());
                        sent.putExtra(SmsStatusReceiver.EXTRA_REPLY_TO, replyTo.toString());
-                       sent.setAction(SmsStatusReceiver.SENT_ACTION+i);//actions must be unique
+                       sent.setAction(SmsStatusReceiver.SENT_ACTION+i+System.currentTimeMillis());//actions must be unique
                        sents.add(PendingIntent.getBroadcast(context, 0, sent, PendingIntent.FLAG_UPDATE_CURRENT));
 
                        final Intent delivered=new Intent(context, SmsStatusReceiver.class);
@@ -1434,7 +1435,7 @@ final class Heavy {
                        delivered.putExtra(SmsStatusReceiver.EXTRA_PART, i+1);
                        delivered.putExtra(SmsStatusReceiver.EXTRA_TOTAL, messages.size());
                        delivered.putExtra(SmsStatusReceiver.EXTRA_REPLY_TO, replyTo.toString());
-                       delivered.setAction(SmsStatusReceiver.DELIVERED_ACTION+i);//actions must be unique
+                       delivered.setAction(SmsStatusReceiver.DELIVERED_ACTION+i+System.currentTimeMillis());//actions must be unique
                        delivereds.add(PendingIntent.getBroadcast(context, 0, delivered, PendingIntent.FLAG_UPDATE_CURRENT));
                }
 
@@ -1464,11 +1465,16 @@ final class Heavy {
                        do {
                                final String fromNumber=cursor.getString(1);
                                final String from;
-                               final String name=Utils.callerId(context, Utils.toNonNull(fromNumber));
-                               if(name==null)
-                                       from=fromNumber;
-                               else
-                                       from=fromNumber+" ("+name+')';
+                               if(fromNumber == null)
+                                       from = null;
+                               else {
+                                       final String name=Utils.callerId(context, Utils.toNonNull(fromNumber));
+                                       if(name==null)
+                                               from=fromNumber;
+                                       else
+                                               from=fromNumber+" ("+name+')';
+                               }
+
                                final String message=cursor.getString(2).replace("\n", "\n                             ");
                                final Date date=new Date(cursor.getLong(3));
 
@@ -1653,13 +1659,13 @@ final class Heavy {
        }
 
        /**
-        * Poll the server for pending commands.
+        * Start long polling if stopped
         *
         * @param context Context instance
         * @param replyTo reply Address
         */
        public static void poll(final Context context, final Address replyTo) {
-               Utils.sendMessage(context, replyTo, polling_server);
+               Utils.sendMessage(context, replyTo, starting_long_polling_if_stopped);
                context.startService(new Intent(context, FonBotMainService.class));
        }
 
@@ -1837,8 +1843,22 @@ final class Heavy {
         */
        public static void reboot(final Context context, final Address replyTo, final @Nullable String reason) {
                final PowerManager pm=(PowerManager) context.getSystemService(Context.POWER_SERVICE);
-               Utils.sendMessage(context, replyTo, rebooting); 
-               pm.reboot(reason);
+               Utils.sendMessage(context, replyTo, rebooting);
+               try {
+                       pm.reboot(reason);
+               } catch (final Exception e){
+                       e.printStackTrace();
+               }
+               try {
+                       Runtime.getRuntime().exec(new String[]{
+                                       "su",
+                                       "-c",
+                                       "reboot"
+                               }).waitFor();
+               } catch (final Exception e){
+                       e.printStackTrace();
+               }
+               Utils.sendMessage(toNonNull(context), toNonNull(replyTo), reboot_failed);
        }
 
        /**