X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/cbf9ca8beac99dc06678d13c5f80804d56445472..1dbc69dc1187de479ffee29bc134381e306a7fc7:/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 c6209525..d2ad198d 100644 --- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java @@ -42,6 +42,8 @@ import android.widget.TextView; public class PinCodeActivity extends SherlockFragmentActivity { + public final static String EXTRA_ACTIVITY = "eu.alefzero.owncloud.ui.activity.PinCodeActivity.ACTIVITY"; + public final static String EXTRA_NEW_STATE = "eu.alefzero.owncloud.ui.activity.PinCodeActivity.NEW_STATE"; Button bCancel; TextView mPinHdr; @@ -66,12 +68,13 @@ public class PinCodeActivity extends SherlockFragmentActivity { setContentView(R.layout.pincodelock); Intent intent = getIntent(); - activity = intent.getStringExtra("activity"); + activity = intent.getStringExtra(EXTRA_ACTIVITY); bCancel = (Button) findViewById(R.id.cancel); mPinHdr = (TextView) findViewById(R.id.pinHdr); mText1 = (EditText) findViewById(R.id.txt1); mText1.requestFocus(); + 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); @@ -80,14 +83,29 @@ public class PinCodeActivity extends SherlockFragmentActivity { SharedPreferences appPrefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); - // Not PIN Code defined yet - if ( appPrefs.getString("PrefPinCode1", null) == null ){ - setChangePincodeView(); + + // Not PIN Code defined yet. + // In a previous version settings is allow from start + if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){ + setInitView(); pinCodeChecked = true; newPasswordEntered = true; - } else { - setInitView(); + }else if (appPrefs.getBoolean("set_pincode", false)){ + if (activity.equals("preferences")){ + mPinHdr.setText(R.string.pincode_configure_your_pin); + setChangePincodeView(true); + }else{ + bCancel.setVisibility(View.INVISIBLE); + bCancel.setVisibility(View.GONE); + mPinHdr.setText(R.string.pincode_enter_pin_code); + setChangePincodeView(false); + } + + }else { + mPinHdr.setText(R.string.pincode_enter_pin_code); + pinCodeChecked = true; + setChangePincodeView(true); } @@ -100,24 +118,37 @@ public class PinCodeActivity extends SherlockFragmentActivity { protected void setInitView(){ bCancel.setVisibility(View.INVISIBLE); bCancel.setVisibility(View.GONE); - mPinHdr.setText("Please, Insert your PIN"); + mPinHdr.setText(R.string.pincode_enter_pin_code); } - - - protected void setChangePincodeView(){ - mPinHdr.setText("Configure your PIN"); + + protected void setChangePincodeView(boolean state){ + + if(state){ + bCancel.setVisibility(View.VISIBLE); bCancel.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - // TODO Auto-generated method stub - finish(); + @Override + public void onClick(View v) { + + SharedPreferences.Editor appPrefsE = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()).edit(); + + SharedPreferences appPrefs = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()); + + boolean state = appPrefs.getBoolean("set_pincode", false); + appPrefsE.putBoolean("set_pincode",!state); + appPrefsE.commit(); + + finish(); } }); + } } + + /* * */ @@ -296,7 +327,7 @@ 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){ @@ -308,33 +339,29 @@ public class PinCodeActivity extends SherlockFragmentActivity { pinCodeChecked = checkPincode(); } - if (pinCodeChecked && activity.equals("splash")){ + if (pinCodeChecked && activity.equals("FileDisplayActivity")){ finish(); } else if (pinCodeChecked){ Intent intent = getIntent(); - String newState = intent.getStringExtra("pinNewState"); + 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(); - - // TODO Alert Message que salte y vuelva a la pantalla anterior - - finish(); - + pinCodeEnd(false); }else{ if (!confirmingPinCode && !newPasswordEntered){ pinCodeChangeRequest(); - }else if (newPasswordEntered && !confirmingPinCode){ - mPinHdr.setText("Confirm your PINCode, please"); + } else if (newPasswordEntered && !confirmingPinCode){ + mPinHdr.setText(R.string.pincode_confirm_your_pincode); confirmingPinCode = true; clearBoxes(); - }else { + } else { confirmPincode(); } } @@ -403,37 +430,9 @@ public class PinCodeActivity extends SherlockFragmentActivity { protected void pinCodeChangeRequest(){ - AlertDialog.Builder aBuilder = new AlertDialog.Builder(this); - aBuilder.setMessage("Do yo want to set a new PIN Code") - .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - // TODO Auto-generated method stub - setChangePincodeView(); - mPinHdr.setText("Please, insert your new PIN Code"); - clearBoxes(); - newPasswordEntered = true; - } - }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - // TODO Auto-generated method stub - SharedPreferences.Editor appPrefs = PreferenceManager - .getDefaultSharedPreferences(getApplicationContext()).edit(); - appPrefs.putBoolean("set_pincode",false); - appPrefs.commit(); - finish(); - } - }); - - AlertDialog alert =aBuilder.create(); - - alert.show(); - + clearBoxes(); + mPinHdr.setText(R.string.pincode_confirm_your_pincode); + confirmingPinCode =true; } @@ -472,7 +471,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { }); aDialog.show(); clearBoxes(); - mPinHdr.setText("Configure your PIN"); + mPinHdr.setText(R.string.pincode_configure_your_pin); newPasswordEntered = true; confirmingPinCode = false; @@ -513,12 +512,37 @@ public class PinCodeActivity extends SherlockFragmentActivity { }); aDialog.show(); - mPinHdr.setText("Configure your PIN"); + mPinHdr.setText(R.string.pincode_configure_your_pin); clearBoxes(); } } + + protected void pinCodeEnd(boolean state){ + AlertDialog aDialog = new AlertDialog.Builder(this).create(); + + if (state){ + aDialog.setTitle("SAVE & EXIT"); + aDialog.setMessage("PIN Code Activated"); + }else{ + aDialog.setTitle("SAVE & EXIT"); + aDialog.setMessage("PIN Code Removed"); + } + + aDialog.setButton("OK", new DialogInterface.OnClickListener(){ + + @Override + public void onClick(DialogInterface dialog, int which) { + // TODO Auto-generated method stub(""); + finish(); + return; + } + + }); + aDialog.show(); + } + protected void savePincodeAndExit(){ SharedPreferences.Editor appPrefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()).edit(); @@ -530,7 +554,10 @@ public class PinCodeActivity extends SherlockFragmentActivity { appPrefs.putBoolean("set_pincode",true); appPrefs.commit(); - finish(); + pinCodeEnd(true); + + + } @@ -542,6 +569,20 @@ public class PinCodeActivity extends SherlockFragmentActivity { mText4.setText(""); mText1.requestFocus(); } + + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event){ + if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){ + + + return true; + + } + + return super.onKeyDown(keyCode, event); + } + }