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

diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
index 43e8b3f..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;
@@ -166,7 +163,7 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
 			else if(message != null && callback != null){
 				if(message.charAt(message.length()-1) == ')')//message is (something)
 					message=message.substring(1, message.length()-1);
-				else
+				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);
 			}