Make FonBot more reliable

[fonbot.git] / src / ro / ieval / fonbot / HttpCallExecutableRunnable.java

diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
index 43e8b3fabb6f479a170a825c3323ea524a027b3b..0eda24af98154dcc56f8864ab75b331691f588eb 100644 (file)
--- 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
  * 
@@ -135,14 +133,14 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
                try {
                        final URL url=Utils.getServerURL(toNonNull(context),toNonNull(path));
                        final HttpURLConnection conn=(HttpURLConnection) url.openConnection();
+                       conn.setReadTimeout(24*60*1000);//24 minutes
                        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){
+                       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 +164,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);
                        }