X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/424164206f616fab373db9261b0213ba7d1d7ce8..6a9eaaf9aa6ce01ed788d057c56face20fa88dc3:/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 6c65bbb5..5fd7213a 100644 --- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java @@ -23,19 +23,25 @@ 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; @@ -76,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()); @@ -89,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; @@ -112,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); } @@ -122,6 +129,8 @@ public class PinCodeActivity extends SherlockFragmentActivity { } + + protected void setInitVars(){ confirmingPinCode = false; @@ -178,29 +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(); - - } - - 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(); + } } }); @@ -214,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(); + } } }); @@ -266,10 +262,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(); - }else { - mText1.append(""); + mText1.setSelected(true); + mText1.setSelection(0); } } @@ -284,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(); + } } }); @@ -334,10 +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); } } @@ -351,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(); + } + } + + + } + } } }); @@ -436,12 +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); } } @@ -483,10 +495,12 @@ 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) { @@ -527,10 +541,12 @@ public class PinCodeActivity extends SherlockFragmentActivity { 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) { @@ -551,14 +567,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) { @@ -624,6 +646,8 @@ public class PinCodeActivity extends SherlockFragmentActivity { return super.onKeyDown(keyCode, event); } - + + + }