X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FUtils.java;h=9a23d04afcd09f585b16c448274176fdbca51bff;hb=c7b1fdf5aa45b0459095e780d0929f8ddd80d8fb;hp=c425420e84013dfa545d55ff2e6633853304d044;hpb=a646935d0f44af999dca8b068aa9568ed5aab988;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index c425420..9a23d04 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -18,6 +18,8 @@ import android.database.Cursor;
 import android.location.LocationManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.PhoneLookup;
 import android.telephony.SmsManager;
@@ -65,7 +67,7 @@ public final class Utils {
 		LS, RM, CONTACTS, DISABLE, ENABLE,
 		POLL, HANGUP, ANSWER, LAUNCH, DATA,
 		GPS, GLOCATION, REBOOT, NOTIFY, SCREENCAP,
-		TORCH
+		TORCH, GETFILE
 	}
 
 	/**
@@ -295,12 +297,16 @@ public final class Utils {
 	public static void sendMessage(final Context context, final Address address, final String message){
 		switch(address.protocol){
 		case HTTP:
-			new HttpCallExecutableRunnable("/send", toNonNull(Arrays.asList(
-					new Header("X-Destination", toNonNull(address.data)))), context, null, true, message).execute();
+			new HttpCallExecutableRunnable("/send", toNonNull(Arrays.asList(new Header("X-Destination", toNonNull(address.data)))), context, null, true, address.requestId == null ? message : address.requestId + " " + message).execute();
 			break;
 
 		case SMS:
-			SmsManager.getDefault().sendTextMessage(address.data, null, message, null, null);
+			new Handler(Looper.getMainLooper()).post(new Runnable(){
+					@Override
+					public void run(){
+						SmsManager.getDefault().sendTextMessage(address.data, null, message, null, null);
+					}
+				});
 			break;
 
 		case LOCAL:
@@ -383,9 +389,10 @@ public final class Utils {
 	 * @throws MalformedURLException if the user preferences create an invalid URL
 	 */
 	public static URL getServerURL(final Context context, final String path) throws MalformedURLException{
+		final String protocol=PreferenceManager.getDefaultSharedPreferences(context).getString("protocol", "https");
 		final String hostname=PreferenceManager.getDefaultSharedPreferences(context).getString("hostname", "fonbot.ieval.ro");
 		final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "443"));
-		final URL url=new URL("http", hostname, port, path);
+		final URL url=new URL(protocol, hostname, port, path);
 		return url;
 	}
 
@@ -986,6 +993,22 @@ public final class Utils {
 		case TORCH:
 			Heavy.torch(context, replyTo);
 			break;
+
+		case GETFILE:
+			if(args.length != 3){
+				Heavy.help(context, replyTo, toNonNull(Command.GETFILE));
+				return;
+			}
+
+			final int getfilePort;
+			try{
+				getfilePort=Integer.parseInt(args[2]);
+			} catch (NumberFormatException e){
+				sendMessage(context, replyTo, cannot_parse_port);
+				break;
+			}
+			Heavy.getfile(context, replyTo, toNonNull(args[0]), toNonNull(args[1]), getfilePort);
+			break;
 		}
 
 	}