Merge branch 'develop' into login_view_layout_improvements

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 3df4c46..375ef3b 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -269,7 +269,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
             @Override\r
             public void afterTextChanged(Editable s) {\r
 \r
             @Override\r
             public void afterTextChanged(Editable s) {\r

-                mOkButton.setEnabled(false);\r
+                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
+                    mOkButton.setEnabled(false);\r
+                }\r

             }\r
 \r
             @Override\r
             }\r
 \r
             @Override\r


@@ -640,7 +642,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 url = url.substring(0, url.length() - 1);\r
             }\r
         }\r
                 url = url.substring(0, url.length() - 1);\r
             }\r
         }\r

-        return url;\r
+        return (url != null ? url : "");\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r