Throw NPE when toNonNull gets a null

[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 a513ed63ca8efbf1fe034e3731a317da72a291b0..4781d6161616e631a23d6489aac92ebf94ac1954 100644 (file)
--- a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
+++ b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java
@@ -139,7 +139,7 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{
                        }
                        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;
@@ -163,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);
                        }