From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 24 May 2013 08:36:21 +0000 (+0200)
Subject: Merge branch 'develop' into login_toggle_password_icon
X-Git-Tag: oc-android-1.4.3~16^2~1^2^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7160a49e20c34b3ee34105526eed50e124979834?ds=inline;hp=-c

Merge branch 'develop' into login_toggle_password_icon
---

7160a49e20c34b3ee34105526eed50e124979834
diff --combined res/layout-land/account_setup.xml
index 52f53925,b8b8b534..dea86cd9
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@@ -50,10 -50,10 +50,10 @@@
  			    android:id="@+id/LinearLayout1"
  			    android:layout_width="match_parent"
  			    android:layout_height="wrap_content"
- 			    android:layout_margin="8dp"
  			    android:focusable="true"
  			    android:gravity="center"
- 			    android:orientation="vertical" >
+ 			    android:orientation="vertical"
+ 			    android:padding="8dp" >
  		
  				<EditText
  					android:id="@+id/hostUrlInput"
@@@ -122,16 -122,28 +122,16 @@@
  					android:hint="@string/auth_username"
  					android:inputType="textNoSuggestions" />
  		
 -				<FrameLayout
 +				<EditText
 +				    android:id="@+id/account_password"
  					android:layout_width="match_parent"
  					android:layout_height="wrap_content"
 -					>
 -					<EditText
 -						android:id="@+id/account_password"
 -						android:layout_width="match_parent"
 -						android:layout_height="wrap_content"
 -						android:ems="10"
 -						android:hint="@string/auth_password"
 -						android:inputType="textPassword"/>
 -					
 -					<ImageView
 -						android:id="@+id/viewPasswordButton"
 -						android:layout_width="wrap_content"
 -						android:layout_height="wrap_content"
 -						android:layout_gravity="right|center_vertical"
 -						android:src="@android:drawable/ic_menu_view"
 -						android:onClick="onViewPasswordClick"
 -						android:visibility="invisible" />
 -				</FrameLayout>
 -		     
 +					android:ems="10"
 +					android:hint="@string/auth_password"
 +					android:inputType="textPassword"
 +					android:drawablePadding="5dp"
 +					/>
 +		        
  				<TextView
  					android:id="@+id/auth_status_text"
  					android:layout_width="match_parent"
diff --combined res/layout/account_setup.xml
index 01593faa,45efab16..688e525b
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -17,24 -17,20 +17,20 @@@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
- 
  <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
      android:layout_width="match_parent"
      android:layout_height="match_parent"
      android:layout_gravity="center"
- 	android:padding="8dip"
      android:fillViewport="true"
-     android:orientation="vertical"
-     >
+     android:orientation="vertical" >
  
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
- 		android:layout_margin="8dip"
-         android:gravity="center"
-         android:orientation="vertical" 
          android:focusable="true"
-         >
+         android:gravity="center"
+         android:orientation="vertical"
+         android:padding="8dp" >
  
          <ImageView
              android:id="@+id/imageView1"
@@@ -105,16 -101,28 +101,16 @@@
              android:hint="@string/auth_username"
              android:inputType="textNoSuggestions" />
  
 -        <FrameLayout
 -            android:layout_width="match_parent"
 -            android:layout_height="wrap_content" >
 -
 -            <EditText
 -                android:id="@+id/account_password"
 -                android:layout_width="match_parent"
 -                android:layout_height="wrap_content"
 -                android:ems="10"
 -                android:hint="@string/auth_password"
 -                android:inputType="textPassword" />
 -
 -            <ImageView
 -                android:id="@+id/viewPasswordButton"
 -                android:layout_width="wrap_content"
 -                android:layout_height="wrap_content"
 -                android:layout_gravity="right|center_vertical"
 -                android:onClick="onViewPasswordClick"
 -                android:src="@android:drawable/ic_menu_view"
 -                android:visibility="invisible" />
 -        </FrameLayout>
 -
 +		<EditText
 +		    android:id="@+id/account_password"
 +			android:layout_width="match_parent"
 +			android:layout_height="wrap_content"
 +			android:ems="10"
 +			android:hint="@string/auth_password"
 +			android:inputType="textPassword"
 +			android:drawablePadding="5dp"
 +			/>
 +        
          <TextView
              android:id="@+id/auth_status_text"
              android:layout_width="match_parent"
@@@ -133,7 -141,7 +129,7 @@@
              android:enabled="false"
              android:onClick="onOkClick"
              android:text="@string/setup_btn_connect"
-             android:textColor="@android:color/black" />
+             />
  
          <Button
              android:id="@+id/account_register"
diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 77fa724b,375ef3b1..7a482320
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -48,7 -48,9 +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;
@@@ -59,6 -61,7 +61,6 @@@ import android.view.inputmethod.EditorI
  import android.widget.CheckBox;
  import android.widget.EditText;
  import android.widget.Button;
 -import android.widget.ImageView;
  import android.widget.TextView;
  import android.widget.Toast;
  import android.widget.TextView.OnEditorActionListener;
@@@ -92,7 -95,6 +94,7 @@@ public class AuthenticatorActivity exte
      private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT";
      private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";
      private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";
 +    private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";
      private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";
      private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";
      
@@@ -129,6 -131,7 +131,6 @@@
      private byte mAction;
      private Account mAccount;
      
 -    private ImageView mViewPasswordButton;
      private EditText mHostUrlInput;
      private EditText mUsernameInput;
      private EditText mPasswordInput;
@@@ -153,6 -156,7 +155,6 @@@
          
          /// set view and get references to view elements
          setContentView(R.layout.account_setup);
 -        mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton);
          mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
          mUsernameInput = (EditText) findViewById(R.id.account_username);
          mPasswordInput = (EditText) findViewById(R.id.account_password);
@@@ -212,9 -216,6 +214,9 @@@
              mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);
              mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT);
              mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON);
 +            if (savedInstanceState.getBoolean(KEY_PASSWORD_VISIBLE, false)) {
 +                showPassword();
 +            }
              
              /// server data
              String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);
@@@ -260,24 -261,29 +262,40 @@@
          mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {
              @Override
              public boolean onDrawableTouch(final MotionEvent event) {
 -                AuthenticatorActivity.this.onRefreshClick(mHostUrlInput);
 +                if (event.getAction() == MotionEvent.ACTION_UP) {
 +                    AuthenticatorActivity.this.onRefreshClick();
 +                }
                  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);
 +        mPasswordInput.setOnTouchListener(new RightDrawableOnTouchListener() {
 +            @Override
 +            public boolean onDrawableTouch(final MotionEvent event) {
 +                if (event.getAction() == MotionEvent.ACTION_UP) {
 +                    AuthenticatorActivity.this.onViewPasswordClick();
 +                }
 +                return true;
 +            }
 +        });
      }
      
      /**
@@@ -299,7 -305,6 +317,7 @@@
          outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked);
          outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mOcServerChkOperation != null));
          outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);
 +        outState.putBoolean(KEY_PASSWORD_VISIBLE, isPasswordVisible());
          outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);
          outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);
          
@@@ -409,6 -414,8 +427,8 @@@
      private void onUrlInputFocusLost(TextView hostInput) {
          if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
              checkOcServer();
+         } else {
+             mOkButton.setEnabled(mServerIsValid);
          }
      }
  
@@@ -447,40 -454,15 +467,40 @@@
       */
      private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) {
          if (hasFocus) {
 -            mViewPasswordButton.setVisibility(View.VISIBLE);
 +            showViewPasswordButton();
          } else {
 -            int input_type = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;
 -            passwordInput.setInputType(input_type);
 -            mViewPasswordButton.setVisibility(View.INVISIBLE);
 +            hidePassword();
 +            hidePasswordButton();
          }
      }
  
  
 +    private void showViewPasswordButton() {
 +        int drawable = android.R.drawable.ic_menu_view;
 +        if (isPasswordVisible()) {
 +            drawable = android.R.drawable.ic_secure;
 +        }
 +        mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, drawable, 0);
 +    }
 +
 +    private boolean isPasswordVisible() {
 +        return ((mPasswordInput.getInputType() & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
 +    }
 +    
 +    private void hidePasswordButton() {
 +        mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 +    }
 +
 +    private void showPassword() {
 +        mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
 +        showViewPasswordButton();
 +    }
 +    
 +    private void hidePassword() {
 +        mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
 +        showViewPasswordButton();
 +    }
 +    
      
      /**
       * Cancels the authenticator activity
@@@ -660,7 -642,7 +680,7 @@@
                  url = url.substring(0, url.length() - 1);
              }
          }
-         return url;
+         return (url != null ? url : "");
      }
  
      /**
@@@ -1126,25 -1108,30 +1146,25 @@@
       * 
       * @param view      Refresh 'button'
       */
 -    public void onRefreshClick(View view) {
 +    public void onRefreshClick() {
          checkOcServer();
      }
      
      
 +    
      /**
       * Called when the eye icon in the password field is clicked.
       * 
       * Toggles the visibility of the password in the field. 
 -     * 
 -     * @param view      'View password' 'button'
       */
 -    public void onViewPasswordClick(View view) {
 +    public void onViewPasswordClick() {
          int selectionStart = mPasswordInput.getSelectionStart();
          int selectionEnd = mPasswordInput.getSelectionEnd();
 -        int input_type = mPasswordInput.getInputType();
 -        if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {
 -            input_type = InputType.TYPE_CLASS_TEXT
 -                    | InputType.TYPE_TEXT_VARIATION_PASSWORD;
 +        if (isPasswordVisible()) {
 +            hidePassword();
          } else {
 -            input_type = InputType.TYPE_CLASS_TEXT
 -                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
 +            showPassword();
          }
 -        mPasswordInput.setInputType(input_type);
          mPasswordInput.setSelection(selectionStart, selectionEnd);
      }    
      
@@@ -1175,11 -1162,13 +1195,11 @@@
              mOAuthTokenEndpointText.setVisibility(View.VISIBLE);
              mUsernameInput.setVisibility(View.GONE);
              mPasswordInput.setVisibility(View.GONE);
 -            mViewPasswordButton.setVisibility(View.GONE);
          } else {
              mOAuthAuthEndpointText.setVisibility(View.GONE);
              mOAuthTokenEndpointText.setVisibility(View.GONE);
              mUsernameInput.setVisibility(View.VISIBLE);
              mPasswordInput.setVisibility(View.VISIBLE);
 -            mViewPasswordButton.setVisibility(View.INVISIBLE);
          }     
  
      }    
@@@ -1227,21 -1216,23 +1247,21 @@@
           */
          @Override
          public boolean onTouch(View view, MotionEvent event) {
 -            if (event.getAction() == MotionEvent.ACTION_DOWN) {
 -                Drawable rightDrawable = null;
 -                if (view instanceof TextView) {
 -                    Drawable[] drawables = ((TextView)view).getCompoundDrawables();
 -                    if (drawables.length > 2) {
 -                        rightDrawable = drawables[2];
 -                    }
 +            Drawable rightDrawable = null;
 +            if (view instanceof TextView) {
 +                Drawable[] drawables = ((TextView)view).getCompoundDrawables();
 +                if (drawables.length > 2) {
 +                    rightDrawable = drawables[2];
                  }
 -                if (rightDrawable != null) {
 -                    final int x = (int) event.getX();
 -                    final int y = (int) event.getY();
 -                    final Rect bounds = rightDrawable.getBounds();
 -                    if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz)
 -                        && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) {
 -                        
 -                        return onDrawableTouch(event);
 -                    }
 +            }
 +            if (rightDrawable != null) {
 +                final int x = (int) event.getX();
 +                final int y = (int) event.getY();
 +                final Rect bounds = rightDrawable.getBounds();
 +                if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz)
 +                    && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) {
 +                    
 +                    return onDrawableTouch(event);
                  }
              }
              return false;