X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/91b1728493397437b37a03740260f43fdd82f173..0583bc8b33e4f337c6446ddea2cc1d7545cbc3ec:/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 d9ae73c5..1b0819e2 100644 --- 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()); @@ -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; @@ -182,7 +193,11 @@ public class PinCodeActivity extends SherlockFragmentActivity { tempText[0] = mText1.getText().toString(); } + + mText1.setTransformationMethod(new PasswordTransformationMethod()); mText2.requestFocus(); + + } } @@ -196,6 +211,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { @Override public void afterTextChanged(Editable s) { // TODO Auto-generated method stub + } }); @@ -215,7 +231,9 @@ public class PinCodeActivity extends SherlockFragmentActivity { if (!confirmingPinCode){ tempText[1] = mText2.getText().toString(); } + mText3.requestFocus(); + } } @@ -243,7 +261,8 @@ public class PinCodeActivity extends SherlockFragmentActivity { mText1.setText(""); mText1.requestFocus(); - tempText[0] = ""; + if (!confirmingPinCode) + tempText[0] = ""; bChange= false; }else if(!bChange){ @@ -259,6 +278,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { @Override public void onFocusChange(View v, boolean hasFocus) { // TODO Auto-generated method stub + if (mText1.getText().toString().equals("")){ mText1.requestFocus(); } @@ -281,6 +301,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { tempText[2] = mText3.getText().toString(); } mText4.requestFocus(); + } } @@ -306,7 +327,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,6 +345,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { @Override public void onFocusChange(View v, boolean hasFocus) { // TODO Auto-generated method stub + if (mText1.getText().toString().equals("")){ mText1.requestFocus(); }else if (mText2.getText().toString().equals("")){ @@ -370,12 +393,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 +431,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,6 +448,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { @Override public void onFocusChange(View v, boolean hasFocus) { // TODO Auto-generated method stub + if (mText1.getText().toString().equals("")){ mText1.requestFocus(); }else if (mText2.getText().toString().equals("")){ @@ -472,11 +494,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 +540,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 +568,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 +647,8 @@ public class PinCodeActivity extends SherlockFragmentActivity { return super.onKeyDown(keyCode, event); } - + + + }