projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Quick patch to fix operations not ready for HTTPS
[pub/Android/ownCloud.git] / 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 d9ae73c..2253d16 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
@@ -17,23 +17,31 @@
  */
 package eu.alefzero.owncloud.ui.activity;
 
+import java.util.Arrays;
+
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 import eu.alefzero.owncloud.R;
 
+
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Typeface;
 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.text.method.PasswordTransformationMethod;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -74,12 +82,13 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
-        getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);        
+        getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         mText2 = (EditText) findViewById(R.id.txt2);
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         
         
+        
         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
         
@@ -87,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;
             
@@ -110,7 +119,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
            }else {
             // pincode removal
-              mPinHdr.setText(R.string.pincode_enter_pin_code);
+              mPinHdr.setText(R.string.pincode_remove_your_pincode);
               pinCodeChecked = false;
               setChangePincodeView(true); 
            }
@@ -120,6 +129,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         
         
     }
+    
+
      
     protected void setInitVars(){
         confirmingPinCode = false;
@@ -196,6 +207,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void afterTextChanged(Editable s) {
                 // TODO Auto-generated method stub
+                
 
             }
         });
@@ -215,7 +227,9 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                     if (!confirmingPinCode){
                         tempText[1] = mText2.getText().toString();
                     }
+                    
                     mText3.requestFocus();
+                    
                 }
             }
 
@@ -243,7 +257,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                     mText1.setText("");
                     mText1.requestFocus();
-                    tempText[0] = "";
+                    if (!confirmingPinCode)
+                       tempText[0] = "";
                     bChange= false;
                 
                 }else if(!bChange){
@@ -259,8 +274,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             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);
                 }
                 
             }
@@ -281,6 +302,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                         tempText[2] = mText3.getText().toString();
                     }
                     mText4.requestFocus();
+                    
                 }
             }
 
@@ -306,7 +328,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText2.requestFocus();
-                    tempText[1] = "";
+                    if (!confirmingPinCode)
+                        tempText[1] = "";
                     mText2.setText("");
                     bChange= false;
                     
@@ -323,10 +346,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);
                 }
                 
             }
@@ -370,12 +402,9 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                            
                        }else{
                        
-                           if (!confirmingPinCode && !newPasswordEntered){
+                           if (!confirmingPinCode){
                                pinCodeChangeRequest();
-                           } else if (newPasswordEntered && !confirmingPinCode){
-                               mPinHdr.setText(R.string.pincode_reenter_your_pincode);
-                               confirmingPinCode = true;
-                               clearBoxes();
+                            
                            } else {
                                confirmPincode();
                            }
@@ -411,7 +440,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText3.requestFocus();
-                    tempText[2]="";
+                    if (!confirmingPinCode)
+                        tempText[2]="";
                     mText3.setText("");
                     bChange= false;
                     
@@ -427,12 +457,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);
                 }
                 
             }
@@ -472,11 +517,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         
         
         }else {
+            Arrays.fill(tempText, null);
             AlertDialog aDialog = new AlertDialog.Builder(this).create();
-            aDialog.setTitle("ERROR");
+            CharSequence errorSeq = getString(R.string.common_error);
+            aDialog.setTitle(errorSeq);
             CharSequence cseq = getString(R.string.pincode_wrong);
             aDialog.setMessage(cseq);
-            aDialog.setButton("OK", new DialogInterface.OnClickListener(){
+            CharSequence okSeq = getString(R.string.common_ok);
+            aDialog.setButton(okSeq, new DialogInterface.OnClickListener(){
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -515,11 +563,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
         } else {
             
+            Arrays.fill(tempText, null);
             AlertDialog aDialog = new AlertDialog.Builder(this).create();
-            aDialog.setTitle("ERROR");
+            CharSequence errorSeq = getString(R.string.common_error);
+            aDialog.setTitle(errorSeq);
             CharSequence cseq = getString(R.string.pincode_mismatch);
             aDialog.setMessage(cseq);
-            aDialog.setButton("OK", new DialogInterface.OnClickListener(){
+            CharSequence okSeq = getString(R.string.common_ok);
+            aDialog.setButton(okSeq, new DialogInterface.OnClickListener(){
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -540,14 +591,20 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         AlertDialog aDialog = new AlertDialog.Builder(this).create();
         
         if (state){
-            aDialog.setTitle("SAVE & EXIT");
-            aDialog.setMessage("PIN Code Activated");
+            CharSequence saveSeq = getString(R.string.common_save_exit);
+            aDialog.setTitle(saveSeq);
+            CharSequence cseq = getString(R.string.pincode_stored);
+            aDialog.setMessage(cseq);
+            
         }else{
-            aDialog.setTitle("SAVE & EXIT");
-            aDialog.setMessage("PIN Code Removed"); 
+            CharSequence saveSeq = getString(R.string.common_save_exit);
+            aDialog.setTitle(saveSeq);
+            CharSequence cseq = getString(R.string.pincode_removed);
+            aDialog.setMessage(cseq);
+            
         }
-        
-        aDialog.setButton("OK", new DialogInterface.OnClickListener(){
+        CharSequence okSeq = getString(R.string.common_ok);
+        aDialog.setButton(okSeq, new DialogInterface.OnClickListener(){
 
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -613,6 +670,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         return super.onKeyDown(keyCode, event);
     }
     
-            
+   
+
+    
             
 }
ownCloud Android App