projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
PinCodeActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index
fc3926d
..
39b973d
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/
src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@
-2,9
+2,8
@@
* Copyright (C) 2011 Bartek Przybylski
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011 Bartek Przybylski
*
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,55
+18,51
@@
package com.owncloud.android.ui.activity;
import java.util.Arrays;
import java.util.Arrays;
+import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.app.SherlockFragmentActivity;
-
import com.owncloud.android.R;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
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.Bundle;
-import android.os.Handler;
import android.preference.PreferenceManager;
import android.text.Editable;
import android.preference.PreferenceManager;
import android.text.Editable;
-import android.text.InputType;
import android.text.TextWatcher;
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.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;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
-
public class PinCodeActivity extends SherlockFragmentActivity {
public class PinCodeActivity extends SherlockFragmentActivity {
- public final static String EXTRA_ACTIVITY = "
eu.alefzero.ownclou
d.ui.activity.PinCodeActivity.ACTIVITY";
- public final static String EXTRA_NEW_STATE = "
eu.alefzero.ownclou
d.ui.activity.PinCodeActivity.NEW_STATE";
+ public final static String EXTRA_ACTIVITY = "
com.owncloud.androi
d.ui.activity.PinCodeActivity.ACTIVITY";
+ public final static String EXTRA_NEW_STATE = "
com.owncloud.androi
d.ui.activity.PinCodeActivity.NEW_STATE";
- Button bCancel;
- TextView mPinHdr;
- EditText mText1;
- EditText mText2;
- EditText mText3;
- EditText mText4;
+ private Button mBCancel;
+ private TextView mPinHdr;
+ private TextView mPinHdrExplanation;
+ private EditText mText1;
+ private EditText mText2;
+ private EditText mText3;
+ private EditText mText4;
-
String [] t
empText ={"","","",""};
+
private String [] mT
empText ={"","","",""};
-
String a
ctivity;
+
private String mA
ctivity;
-
boolean c
onfirmingPinCode = false;
-
boolean p
inCodeChecked = false;
-
boolean n
ewPasswordEntered = false;
-
boolean b
Change = true; // to control that only one blocks jump
-
int t
Counter ; // Count the number of attempts an user could introduce the PIN code
+
private boolean mC
onfirmingPinCode = false;
+
private boolean mP
inCodeChecked = false;
+
private boolean mN
ewPasswordEntered = false;
+
private boolean mB
Change = true; // to control that only one blocks jump
+
//private int mT
Counter ; // Count the number of attempts an user could introduce the PIN code
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(Bundle savedInstanceState) {
@@
-75,10
+70,11
@@
public class PinCodeActivity extends SherlockFragmentActivity {
setContentView(R.layout.pincodelock);
Intent intent = getIntent();
setContentView(R.layout.pincodelock);
Intent intent = getIntent();
-
a
ctivity = intent.getStringExtra(EXTRA_ACTIVITY);
+
mA
ctivity = intent.getStringExtra(EXTRA_ACTIVITY);
-
b
Cancel = (Button) findViewById(R.id.cancel);
+
mB
Cancel = (Button) findViewById(R.id.cancel);
mPinHdr = (TextView) findViewById(R.id.pinHdr);
mPinHdr = (TextView) findViewById(R.id.pinHdr);
+ mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
mText1 = (EditText) findViewById(R.id.txt1);
mText1.requestFocus();
getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
mText1 = (EditText) findViewById(R.id.txt1);
mText1.requestFocus();
getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@
-86,8
+82,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
mText3 = (EditText) findViewById(R.id.txt3);
mText4 = (EditText) findViewById(R.id.txt4);
mText3 = (EditText) findViewById(R.id.txt3);
mText4 = (EditText) findViewById(R.id.txt4);
-
-
SharedPreferences appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
SharedPreferences appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
@@
-96,60
+90,65
@@
public class PinCodeActivity extends SherlockFragmentActivity {
// In a previous version settings is allow from start
if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){
setChangePincodeView(true);
// In a previous version settings is allow from start
if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){
setChangePincodeView(true);
-
p
inCodeChecked = true;
-
n
ewPasswordEntered = true;
+
mP
inCodeChecked = true;
+
mN
ewPasswordEntered = true;
}else{
if (appPrefs.getBoolean("set_pincode", false)){
// pincode activated
}else{
if (appPrefs.getBoolean("set_pincode", false)){
// pincode activated
- if (
a
ctivity.equals("preferences")){
+ if (
mA
ctivity.equals("preferences")){
// PIN has been activated yet
mPinHdr.setText(R.string.pincode_configure_your_pin);
// PIN has been activated yet
mPinHdr.setText(R.string.pincode_configure_your_pin);
- pinCodeChecked = true ; // No need to check it
+ mPinHdrExplanation.setVisibility(View.VISIBLE);
+ mPinCodeChecked = true ; // No need to check it
setChangePincodeView(true);
}else{
// PIN active
setChangePincodeView(true);
}else{
// PIN active
-
b
Cancel.setVisibility(View.INVISIBLE);
-
b
Cancel.setVisibility(View.GONE);
+
mB
Cancel.setVisibility(View.INVISIBLE);
+
mB
Cancel.setVisibility(View.GONE);
mPinHdr.setText(R.string.pincode_enter_pin_code);
mPinHdr.setText(R.string.pincode_enter_pin_code);
+ mPinHdrExplanation.setVisibility(View.INVISIBLE);
setChangePincodeView(false);
}
}else {
// pincode removal
mPinHdr.setText(R.string.pincode_remove_your_pincode);
setChangePincodeView(false);
}
}else {
// pincode removal
mPinHdr.setText(R.string.pincode_remove_your_pincode);
- pinCodeChecked = false;
+ mPinHdrExplanation.setVisibility(View.INVISIBLE);
+ mPinCodeChecked = false;
setChangePincodeView(true);
}
}
setTextListeners();
setChangePincodeView(true);
}
}
setTextListeners();
-
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
protected void setInitVars(){
}
protected void setInitVars(){
-
c
onfirmingPinCode = false;
-
p
inCodeChecked = false;
-
n
ewPasswordEntered = false;
+
mC
onfirmingPinCode = false;
+
mP
inCodeChecked = false;
+
mN
ewPasswordEntered = false;
}
protected void setInitView(){
}
protected void setInitView(){
-
b
Cancel.setVisibility(View.INVISIBLE);
-
b
Cancel.setVisibility(View.GONE);
+
mB
Cancel.setVisibility(View.INVISIBLE);
+
mB
Cancel.setVisibility(View.GONE);
mPinHdr.setText(R.string.pincode_enter_pin_code);
mPinHdr.setText(R.string.pincode_enter_pin_code);
+ mPinHdrExplanation.setVisibility(View.INVISIBLE);
}
protected void setChangePincodeView(boolean state){
if(state){
}
protected void setChangePincodeView(boolean state){
if(state){
-
b
Cancel.setVisibility(View.VISIBLE);
-
b
Cancel.setOnClickListener(new OnClickListener() {
+
mB
Cancel.setVisibility(View.VISIBLE);
+
mB
Cancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@Override
public void onClick(View v) {
@@
-196,8
+195,8
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
- if (!
c
onfirmingPinCode){
-
t
empText[0] = mText1.getText().toString();
+ if (!
mC
onfirmingPinCode){
+
mT
empText[0] = mText1.getText().toString();
}
mText2.requestFocus();
}
mText2.requestFocus();
@@
-225,8
+224,8
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
- if (!
c
onfirmingPinCode){
-
t
empText[1] = mText2.getText().toString();
+ if (!
mC
onfirmingPinCode){
+
mT
empText[1] = mText2.getText().toString();
}
mText3.requestFocus();
}
mText3.requestFocus();
@@
-238,18
+237,16
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
- // TODO Auto-generated method stub
-
- if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
+ if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
mText1.setText("");
mText1.requestFocus();
mText1.setText("");
mText1.requestFocus();
- if (!
c
onfirmingPinCode)
-
t
empText[0] = "";
-
b
Change= false;
+ if (!
mC
onfirmingPinCode)
+
mT
empText[0] = "";
+
mB
Change= false;
- }else if(!
b
Change){
-
b
Change=true;
+ }else if(!
mB
Change){
+
mB
Change=true;
}
return false;
}
return false;
@@
-260,8
+257,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
@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(true);
if (mText1.getText().toString().equals("")){
mText2.setSelected(false);
@@
-293,8
+288,8
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
@Override
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
- if (!
c
onfirmingPinCode){
-
t
empText[2] = mText3.getText().toString();
+ if (!
mC
onfirmingPinCode){
+
mT
empText[2] = mText3.getText().toString();
}
mText4.requestFocus();
}
}
mText4.requestFocus();
}
@@
-305,17
+300,15
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
- // TODO Auto-generated method stub
-
- if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
+ if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
mText2.requestFocus();
mText2.requestFocus();
- if (!
c
onfirmingPinCode)
-
t
empText[1] = "";
+ if (!
mC
onfirmingPinCode)
+
mT
empText[1] = "";
mText2.setText("");
mText2.setText("");
-
b
Change= false;
+
mB
Change= false;
- }else if(!
b
Change){
-
b
Change=true;
+ }else if(!
mB
Change){
+
mB
Change=true;
}
return false;
}
return false;
@@
-326,7
+319,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- // TODO Auto-generated method stub
mText3.setCursorVisible(true);
if (mText1.getText().toString().equals("")){
mText3.setSelected(false);
mText3.setCursorVisible(true);
if (mText1.getText().toString().equals("")){
mText3.setSelected(false);
@@
-364,18
+356,19
@@
public class PinCodeActivity extends SherlockFragmentActivity {
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
public void afterTextChanged(Editable s) {
if (s.length() > 0) {
- if (!
c
onfirmingPinCode){
-
t
empText[3] = mText4.getText().toString();
+ if (!
mC
onfirmingPinCode){
+
mT
empText[3] = mText4.getText().toString();
}
mText1.requestFocus();
}
mText1.requestFocus();
- if (!
p
inCodeChecked){
-
p
inCodeChecked = checkPincode();
+ if (!
mP
inCodeChecked){
+
mP
inCodeChecked = checkPincode();
}
}
- if (pinCodeChecked && activity.equals("FileDisplayActivity")){
+ if (mPinCodeChecked &&
+ ( mActivity.equals("FileDisplayActivity") || mActivity.equals("PreviewImageActivity") ) ){
finish();
finish();
- } else if (
p
inCodeChecked){
+ } else if (
mP
inCodeChecked){
Intent intent = getIntent();
String newState = intent.getStringExtra(EXTRA_NEW_STATE);
Intent intent = getIntent();
String newState = intent.getStringExtra(EXTRA_NEW_STATE);
@@
-391,7
+384,7
@@
public class PinCodeActivity extends SherlockFragmentActivity {
}else{
}else{
- if (!
c
onfirmingPinCode){
+ if (!
mC
onfirmingPinCode){
pinCodeChangeRequest();
} else {
pinCodeChangeRequest();
} else {
@@
-411,17
+404,15
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
- // TODO Auto-generated method stub
-
- if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
+ if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
mText3.requestFocus();
mText3.requestFocus();
- if (!
c
onfirmingPinCode)
-
t
empText[2]="";
+ if (!
mC
onfirmingPinCode)
+
mT
empText[2]="";
mText3.setText("");
mText3.setText("");
-
b
Change= false;
+
mB
Change= false;
- }else if(!
b
Change){
-
b
Change=true;
+ }else if(!
mB
Change){
+
mB
Change=true;
}
return false;
}
}
return false;
}
@@
-431,8
+422,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- // TODO Auto-generated method stub
-
mText4.setCursorVisible(true);
if (mText1.getText().toString().equals("")){
mText4.setCursorVisible(true);
if (mText1.getText().toString().equals("")){
@@
-467,7
+456,8
@@
public class PinCodeActivity extends SherlockFragmentActivity {
clearBoxes();
mPinHdr.setText(R.string.pincode_reenter_your_pincode);
clearBoxes();
mPinHdr.setText(R.string.pincode_reenter_your_pincode);
- confirmingPinCode =true;
+ mPinHdrExplanation.setVisibility(View.INVISIBLE);
+ mConfirmingPinCode =true;
}
}
@@
-483,16
+473,16
@@
public class PinCodeActivity extends SherlockFragmentActivity {
String pText3 = appPrefs.getString("PrefPinCode3", null);
String pText4 = appPrefs.getString("PrefPinCode4", null);
String pText3 = appPrefs.getString("PrefPinCode3", null);
String pText4 = appPrefs.getString("PrefPinCode4", null);
- if (
t
empText[0].equals(pText1) &&
-
t
empText[1].equals(pText2) &&
-
t
empText[2].equals(pText3) &&
-
t
empText[3].equals(pText4) ) {
+ if (
mT
empText[0].equals(pText1) &&
+
mT
empText[1].equals(pText2) &&
+
mT
empText[2].equals(pText3) &&
+
mT
empText[3].equals(pText4) ) {
return true;
}else {
return true;
}else {
- Arrays.fill(
t
empText, null);
+ Arrays.fill(
mT
empText, null);
AlertDialog aDialog = new AlertDialog.Builder(this).create();
CharSequence errorSeq = getString(R.string.common_error);
aDialog.setTitle(errorSeq);
AlertDialog aDialog = new AlertDialog.Builder(this).create();
CharSequence errorSeq = getString(R.string.common_error);
aDialog.setTitle(errorSeq);
@@
-503,7
+493,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onClick(DialogInterface dialog, int which) {
@Override
public void onClick(DialogInterface dialog, int which) {
- // TODO Auto-generated method stub("");
return;
}
return;
}
@@
-511,8
+500,9
@@
public class PinCodeActivity extends SherlockFragmentActivity {
aDialog.show();
clearBoxes();
mPinHdr.setText(R.string.pincode_enter_pin_code);
aDialog.show();
clearBoxes();
mPinHdr.setText(R.string.pincode_enter_pin_code);
- newPasswordEntered = true;
- confirmingPinCode = false;
+ mPinHdrExplanation.setVisibility(View.INVISIBLE);
+ mNewPasswordEntered = true;
+ mConfirmingPinCode = false;
}
}
@@
-522,23
+512,23
@@
public class PinCodeActivity extends SherlockFragmentActivity {
protected void confirmPincode(){
protected void confirmPincode(){
-
c
onfirmingPinCode = false;
+
mC
onfirmingPinCode = false;
String rText1 = mText1.getText().toString();
String rText2 = mText2.getText().toString();
String rText3 = mText3.getText().toString();
String rText4 = mText4.getText().toString();
String rText1 = mText1.getText().toString();
String rText2 = mText2.getText().toString();
String rText3 = mText3.getText().toString();
String rText4 = mText4.getText().toString();
- if (
t
empText[0].equals(rText1) &&
-
t
empText[1].equals(rText2) &&
-
t
empText[2].equals(rText3) &&
-
t
empText[3].equals(rText4) ) {
+ if (
mT
empText[0].equals(rText1) &&
+
mT
empText[1].equals(rText2) &&
+
mT
empText[2].equals(rText3) &&
+
mT
empText[3].equals(rText4) ) {
savePincodeAndExit();
} else {
savePincodeAndExit();
} else {
- Arrays.fill(
t
empText, null);
+ Arrays.fill(
mT
empText, null);
AlertDialog aDialog = new AlertDialog.Builder(this).create();
CharSequence errorSeq = getString(R.string.common_error);
aDialog.setTitle(errorSeq);
AlertDialog aDialog = new AlertDialog.Builder(this).create();
CharSequence errorSeq = getString(R.string.common_error);
aDialog.setTitle(errorSeq);
@@
-549,13
+539,13
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onClick(DialogInterface dialog, int which) {
@Override
public void onClick(DialogInterface dialog, int which) {
- // TODO Auto-generated method stub("");
return;
}
});
aDialog.show();
mPinHdr.setText(R.string.pincode_configure_your_pin);
return;
}
});
aDialog.show();
mPinHdr.setText(R.string.pincode_configure_your_pin);
+ mPinHdrExplanation.setVisibility(View.VISIBLE);
clearBoxes();
}
clearBoxes();
}
@@
-583,7
+573,6
@@
public class PinCodeActivity extends SherlockFragmentActivity {
@Override
public void onClick(DialogInterface dialog, int which) {
@Override
public void onClick(DialogInterface dialog, int which) {
- // TODO Auto-generated method stub("");
finish();
return;
}
finish();
return;
}
@@
-596,10
+585,10
@@
public class PinCodeActivity extends SherlockFragmentActivity {
SharedPreferences.Editor appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()).edit();
SharedPreferences.Editor appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()).edit();
- appPrefs.putString("PrefPinCode1",
t
empText[0]);
- appPrefs.putString("PrefPinCode2",
t
empText[1]);
- appPrefs.putString("PrefPinCode3",
t
empText[2]);
- appPrefs.putString("PrefPinCode4",
t
empText[3]);
+ appPrefs.putString("PrefPinCode1",
mT
empText[0]);
+ appPrefs.putString("PrefPinCode2",
mT
empText[1]);
+ appPrefs.putString("PrefPinCode3",
mT
empText[2]);
+ appPrefs.putString("PrefPinCode4",
mT
empText[3]);
appPrefs.putBoolean("set_pincode",true);
appPrefs.commit();
appPrefs.putBoolean("set_pincode",true);
appPrefs.commit();
@@
-624,7
+613,7
@@
public class PinCodeActivity extends SherlockFragmentActivity {
public boolean onKeyDown(int keyCode, KeyEvent event){
if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){
public boolean onKeyDown(int keyCode, KeyEvent event){
if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){
- if (
a
ctivity.equals("preferences")){
+ if (
mA
ctivity.equals("preferences")){
SharedPreferences.Editor appPrefsE = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()).edit();
SharedPreferences.Editor appPrefsE = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()).edit();
projects / pub / Android / ownCloud.git / blobdiff