X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHttpCallExecutableRunnable.java;h=a513ed63ca8efbf1fe034e3731a317da72a291b0;hb=1443a92948e04e18b32a49e3f60fb1a31f6fa871;hp=1f96b1322c038679869f7c00a03da47c395a9457;hpb=561cd6dc86246c1bd4a7a156af6cdc9a5f044567;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
index 1f96b13..a513ed6 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;
@@ -16,8 +16,6 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
-import com.google.android.gcm.GCMRegistrar;
-
 /*
  * Copyright © 2013 Marius Gavrilescu
  * 
@@ -38,7 +36,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>
  */
@@ -134,12 +132,11 @@ 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);
 			}
-			conn.setRequestProperty("X-ID", GCMRegistrar.getRegistrationId(context));
 			final String user=PreferenceManager.getDefaultSharedPreferences(context).getString("username", null);
 			final String password=PreferenceManager.getDefaultSharedPreferences(context).getString("password", null);
 			if(user == null || password == null){
@@ -160,12 +157,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();