X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FUtils.java;h=d9060eb662734475026200ef84587260ef931794;hb=8bfdcf7a444359151c18720b01443d6f507bec7e;hp=d5e0f5bcf8de0d506748fedce0dbdaf143bf4e6d;hpb=8dfb76c9431dbf8401412cb92c7512e7dc3081a2;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index d5e0f5b..d9060eb 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -24,6 +24,8 @@ import static ro.ieval.fonbot.R.string.the_second_argument_to_wipe_must_be;
 import static ro.ieval.fonbot.R.string.unknown_command;
 import static ro.ieval.fonbot.R.string.wipetype_should_be_one_of;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Locale;
 
@@ -314,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 SendHttpMessageAsyncTask("/send", toNonNull(Arrays.asList(
+					new Header("X-Destination", toNonNull(address.data)))), context).execute(message);
 			break;
 
 		case SMS:
@@ -343,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));
 	}
 
@@ -406,6 +410,21 @@ public final class Utils {
 		context.startService(intent);
 	}
 
+	/**
+	 * Gets the server URL according to the user preferences.
+	 *
+	 * @param context Context instance
+	 * @param path URL path
+	 * @return the server URL
+	 * @throws MalformedURLException if the user preferences create an invalid URL
+	 */
+	public static URL getServerURL(final Context context, final String path) throws MalformedURLException{
+		final String hostname=PreferenceManager.getDefaultSharedPreferences(context).getString("hostname", "ieval.ro");
+		final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "7777"));
+		final URL url=new URL("http", hostname, port, path);
+		return url;
+	}
+
 	/**
 	 * Executes a given command
 	 *