X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHttpCallExecutableRunnable.java;h=43e8b3fabb6f479a170a825c3323ea524a027b3b;hb=979c5169a7b576c62417d14883f5e83f3b9a74cd;hp=b54a7ba53affb7325f7c8d9c312cf703e3d1db51;hpb=35ad85f01d2755a81575278714fc3b96a4d9a2a1;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
index b54a7ba..43e8b3f 100644
--- a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
+++ b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
@@ -8,7 +8,7 @@ import java.io.OutputStream;
 import java.net.URL;
 import java.util.Collection;
 
-import javax.net.ssl.HttpsURLConnection;
+import java.net.HttpURLConnection;
 import org.eclipse.jdt.annotation.Nullable;
 
 import android.content.Context;
@@ -38,7 +38,7 @@ import com.google.android.gcm.GCMRegistrar;
  */
 
 /**
- * ExecutableRunnable that makes a HTTPS call to the server and hands the response to a callback
+ * ExecutableRunnable that makes a HTTP(S) call to the server and hands the response to a callback
  *
  * @author Marius Gavrilescu <marius@ieval.ro>
  */
@@ -49,7 +49,7 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 	 *
 	 * @author Marius Gavrilescu
 	 */
-	public static interface ResultCallback{
+	public interface ResultCallback{
 		/**
 		 * Callback invoked if the HTTP call is successful.
 		 *
@@ -57,13 +57,13 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 		 * @param responseMessage HTTP response message
 		 * @param inputStream HTTP content InputStream
 		 */
-		public void onResult(final int responseCode, final String responseMessage, final InputStream inputStream);
+		void onResult(final int responseCode, final String responseMessage, final InputStream inputStream);
 		/**
 		 * Callback invoked if the HTTP call is unsuccessful.
 		 *
 		 * @param error localized error message
 		 */
-		public void onError(final String error);
+		void onError(final String error);
 	}
 
 	/**
@@ -134,7 +134,7 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 	public void run() {
 		try {
 			final URL url=Utils.getServerURL(toNonNull(context),toNonNull(path));
-			final HttpsURLConnection conn=(HttpsURLConnection) url.openConnection();
+			final HttpURLConnection conn=(HttpURLConnection) url.openConnection();
 			if(data!=null){
 				conn.setDoOutput(true);
 				conn.setFixedLengthStreamingMode(data.length);
@@ -160,12 +160,16 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 				stream.close();
 			}
 			Log.d(getClass().getName(),"HTTP Response: "+conn.getResponseCode()+" "+conn.getResponseMessage());
-			final String message=conn.getResponseMessage();
+			String message=conn.getResponseMessage();
 			if(message==null && callback != null)
 				callback.onError(toNonNull(context.getString(no_response_returned_from_server)));
-			else if(message != null && callback != null)
-				callback.onResult(conn.getResponseCode(), message,
-						toNonNull(conn.getInputStream()));
+			else if(message != null && callback != null){
+				if(message.charAt(message.length()-1) == ')')//message is (something)
+					message=message.substring(1, message.length()-1);
+				else
+					message=message.substring(message.indexOf(')')+2);
+				callback.onResult(conn.getResponseCode(), message, conn.getResponseCode() == 200 ? conn.getInputStream() : null);
+			}
 			conn.disconnect();
 		} catch (Exception e) {
 			e.printStackTrace();