X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/69b527c39d82546f053d7ef2b9a1f094f1b4a94e..9dc5a62e44952bdfb972bd46ff4b92ed2cba3d74:/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 77fa724b..cc1adcf3 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,7 +48,9 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -266,6 +268,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 return true;
             }
         });
+        mHostUrlInput.addTextChangedListener(new TextWatcher() {
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
+                    mOkButton.setEnabled(false);
+                }
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            
+        });
         mPasswordInput.setOnFocusChangeListener(this);
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
         mPasswordInput.setOnEditorActionListener(this);
@@ -409,6 +427,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void onUrlInputFocusLost(TextView hostInput) {
         if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
             checkOcServer();
+        } else {
+            mOkButton.setEnabled(mServerIsValid);
         }
     }
 
@@ -456,9 +476,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
     private void showViewPasswordButton() {
-        int drawable = android.R.drawable.ic_menu_view;
+        //int drawable = android.R.drawable.ic_menu_view;
+        int drawable = R.drawable.ic_view;
         if (isPasswordVisible()) {
-            drawable = android.R.drawable.ic_secure;
+            //drawable = android.R.drawable.ic_secure;
+            drawable = R.drawable.ic_hide;
         }
         mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, drawable, 0);
     }
@@ -660,7 +682,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 url = url.substring(0, url.length() - 1);
             }
         }
-        return url;
+        return (url != null ? url : "");
     }
 
     /**
@@ -1220,7 +1242,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     
     private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {
 
-        private int fuzz = 10;
+        private int fuzz = 75;
         
         /**
          * {@inheritDoc}