X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0583bc8b33e4f337c6446ddea2cc1d7545cbc3ec..f3ba107585a68d4108a546f30bf71e13fd22f6ec:/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
index 1b0819e2..5fd7213a 100644
--- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
@@ -96,7 +96,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         // Not PIN Code defined yet.
         // In a previous version settings is allow from start
         if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){
-            setInitView();
+            setChangePincodeView(true);
             pinCodeChecked = true; 
             newPasswordEntered = true;
             
@@ -187,32 +187,22 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
-                // TODO Auto-generated method stub
-                if (s.length() > 0) {
-                   if (!confirmingPinCode){
-                      tempText[0] = mText1.getText().toString();
-                      
-                   }
-                                                        
-                   mText1.setTransformationMethod(new PasswordTransformationMethod());                  
-                   mText2.requestFocus();
-
-                   
-                }
             }
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                     int after) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
-                
-
+                if (s.length() > 0) {
+                    if (!confirmingPinCode){
+                       tempText[0] = mText1.getText().toString();
+                       
+                    }
+                    mText2.requestFocus();
+                 }
             }
         });
         
@@ -226,28 +216,22 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
-                // TODO Auto-generated method stub
-                if (s.length() > 0) {
-                    if (!confirmingPinCode){
-                        tempText[1] = mText2.getText().toString();
-                    }
-                    
-                    mText3.requestFocus();
-                    
-                }
             }
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                     int after) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
-
+                if (s.length() > 0) {
+                    if (!confirmingPinCode){
+                        tempText[1] = mText2.getText().toString();
+                    }
+                    
+                    mText3.requestFocus();
+                }
             }
         });
  
@@ -279,8 +263,13 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
                 
+                mText2.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
+                    mText2.setSelected(false);
+                    mText2.setCursorVisible(false);
                     mText1.requestFocus(); 
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }
                 
             }
@@ -295,27 +284,21 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
-                // TODO Auto-generated method stub
-                if (s.length() > 0) {
-                    if (!confirmingPinCode){
-                        tempText[2] = mText3.getText().toString();
-                    }
-                    mText4.requestFocus();
-                    
-                }
             }
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                     int after) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
-
+                if (s.length() > 0) {
+                    if (!confirmingPinCode){
+                        tempText[2] = mText3.getText().toString();
+                    }
+                    mText4.requestFocus();
+                }
             }
         });
         
@@ -345,11 +328,19 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
-
+                mText3.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
-                    mText1.requestFocus(); 
+                    mText3.setSelected(false);
+                    mText3.setCursorVisible(false);
+                    mText1.requestFocus();
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }else if (mText2.getText().toString().equals("")){
-                    mText2.requestFocus(); 
+                    mText3.setSelected(false);
+                    mText3.setCursorVisible(false);
+                    mText2.requestFocus();
+                    mText2.setSelected(true);
+                    mText2.setSelection(0);
                 }
                 
             }
@@ -363,61 +354,55 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
-                
-                if (s.length() > 0) {
-                   
-                   if (!confirmingPinCode){
-                      tempText[3] = mText4.getText().toString();
-                   }
-                   mText1.requestFocus();
-
-                   if (!pinCodeChecked){
-                       pinCodeChecked = checkPincode();
-                   }
-                   
-                   if (pinCodeChecked && activity.equals("FileDisplayActivity")){
-                       finish();
-                   } else if (pinCodeChecked){
-                       
-                       Intent intent = getIntent();
-                       String newState = intent.getStringExtra(EXTRA_NEW_STATE);
-                       
-                       if (newState.equals("false")){
-                           SharedPreferences.Editor appPrefs = PreferenceManager
-                                   .getDefaultSharedPreferences(getApplicationContext()).edit();
-                           appPrefs.putBoolean("set_pincode",false);
-                           appPrefs.commit();
-                           
-                           setInitVars();
-                           pinCodeEnd(false);
-                           
-                       }else{
-                       
-                           if (!confirmingPinCode){
-                               pinCodeChangeRequest();
-                            
-                           } else {
-                               confirmPincode();
-                           }
-                       }
-                  
-                       
-                   }    
-                                      
-                }
             }
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                     int after) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
+                if (s.length() > 0) {
+                    
+                    if (!confirmingPinCode){
+                       tempText[3] = mText4.getText().toString();
+                    }
+                    mText1.requestFocus();
 
+                    if (!pinCodeChecked){
+                        pinCodeChecked = checkPincode();
+                    }
+                    
+                    if (pinCodeChecked && activity.equals("FileDisplayActivity")){
+                        finish();
+                    } else if (pinCodeChecked){
+                        
+                        Intent intent = getIntent();
+                        String newState = intent.getStringExtra(EXTRA_NEW_STATE);
+                        
+                        if (newState.equals("false")){
+                            SharedPreferences.Editor appPrefs = PreferenceManager
+                                    .getDefaultSharedPreferences(getApplicationContext()).edit();
+                            appPrefs.putBoolean("set_pincode",false);
+                            appPrefs.commit();
+                            
+                            setInitVars();
+                            pinCodeEnd(false);
+                            
+                        }else{
+                        
+                            if (!confirmingPinCode){
+                                pinCodeChangeRequest();
+                             
+                            } else {
+                                confirmPincode();
+                            }
+                        }
+                   
+                        
+                    }    
+                }
             }
         });
 
@@ -448,13 +433,27 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
-               
+                
+                mText4.setCursorVisible(true);
+                
                 if (mText1.getText().toString().equals("")){
-                    mText1.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText1.requestFocus();
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }else if (mText2.getText().toString().equals("")){
-                    mText2.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText2.requestFocus();
+                    mText2.setSelected(true);
+                    mText2.setSelection(0);
                 }else if (mText3.getText().toString().equals("")){
-                    mText3.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText3.requestFocus();
+                    mText3.setSelected(true);
+                    mText3.setSelection(0);
                 }
                 
             }