X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHttpCallExecutableRunnable.java;h=4781d6161616e631a23d6489aac92ebf94ac1954;hb=dd779ac84f5ff98da5455da38a175ebc637a4623;hp=e66a7f8090030360e08dcafcad62c4b659a44404;hpb=ca40a5cc0f95f37d2ac3008d5fa3f0adaf47d736;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
index e66a7f8..4781d61 100644
--- a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
+++ b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
@@ -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
  * 
@@ -139,10 +137,9 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 				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){
+			if(user == null || password == null || user.length() == 0 || password.length() == 0){
 				if(callback!=null)
 					callback.onError(toNonNull(context.getString(user_or_password_not_set)));
 				return;
@@ -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 if(message.charAt(0) == '(')//message is (something) something 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();