Browse Source

remove variable prefixes and sort member variables

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 years ago
parent
commit
6ff582a886
1 changed files with 56 additions and 59 deletions
  1. 56 59
      src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

+ 56 - 59
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -54,11 +54,12 @@ import androidx.appcompat.app.AppCompatActivity;
 public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
     private static final String TAG = PassCodeActivity.class.getSimpleName();
+    private static final String KEY_PASSCODE_DIGITS = "PASSCODE_DIGITS";
+    private static final String KEY_CONFIRMING_PASSCODE = "CONFIRMING_PASSCODE";
 
     public final static String ACTION_REQUEST_WITH_RESULT = "ACTION_REQUEST_WITH_RESULT";
     public final static String ACTION_CHECK_WITH_RESULT = "ACTION_CHECK_WITH_RESULT";
     public final static String ACTION_CHECK = "ACTION_CHECK";
-
     public final static String KEY_PASSCODE  = "KEY_PASSCODE";
     public final static String KEY_CHECK_RESULT = "KEY_CHECK_RESULT";
 
@@ -70,14 +71,10 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
     @Inject AppPreferences preferences;
     private PasscodelockBinding binding;
-    private final EditText[] mPassCodeEditTexts = new EditText[4];
-
-    private String [] mPassCodeDigits = {"","","",""};
-    private static final String KEY_PASSCODE_DIGITS = "PASSCODE_DIGITS";
-    private boolean mConfirmingPassCode;
-    private static final String KEY_CONFIRMING_PASSCODE = "CONFIRMING_PASSCODE";
-
-    private boolean mBChange = true; // to control that only one blocks jump
+    private final EditText[] passCodeEditTexts = new EditText[4];
+    private String [] passCodeDigits = {"","","",""};
+    private boolean confirmingPassCode;
+    private boolean changed = true; // to control that only one blocks jump
 
     /**
      * Initializes the activity.
@@ -96,22 +93,22 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
         ThemeUtils.themeDialogActionButton(binding.cancel);
 
-        mPassCodeEditTexts[0] = binding.txt0;
-        ThemeUtils.colorEditText(mPassCodeEditTexts[0], elementColor);
-        ThemeUtils.themeEditText(this, mPassCodeEditTexts[0], false);
-        mPassCodeEditTexts[0].requestFocus();
+        passCodeEditTexts[0] = binding.txt0;
+        ThemeUtils.colorEditText(passCodeEditTexts[0], elementColor);
+        ThemeUtils.themeEditText(this, passCodeEditTexts[0], false);
+        passCodeEditTexts[0].requestFocus();
 
-        mPassCodeEditTexts[1] = binding.txt1;
-        ThemeUtils.colorEditText(mPassCodeEditTexts[1], elementColor);
-        ThemeUtils.themeEditText(this, mPassCodeEditTexts[1], false);
+        passCodeEditTexts[1] = binding.txt1;
+        ThemeUtils.colorEditText(passCodeEditTexts[1], elementColor);
+        ThemeUtils.themeEditText(this, passCodeEditTexts[1], false);
 
-        mPassCodeEditTexts[2] = binding.txt2;
-        ThemeUtils.colorEditText(mPassCodeEditTexts[2], elementColor);
-        ThemeUtils.themeEditText(this, mPassCodeEditTexts[2], false);
+        passCodeEditTexts[2] = binding.txt2;
+        ThemeUtils.colorEditText(passCodeEditTexts[2], elementColor);
+        ThemeUtils.themeEditText(this, passCodeEditTexts[2], false);
 
-        mPassCodeEditTexts[3] = binding.txt3;
-        ThemeUtils.colorEditText(mPassCodeEditTexts[3], elementColor);
-        ThemeUtils.themeEditText(this, mPassCodeEditTexts[3], false);
+        passCodeEditTexts[3] = binding.txt3;
+        ThemeUtils.colorEditText(passCodeEditTexts[3], elementColor);
+        ThemeUtils.themeEditText(this, passCodeEditTexts[3], false);
 
         Window window = getWindow();
         if (window != null) {
@@ -126,10 +123,10 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
         } else if (ACTION_REQUEST_WITH_RESULT.equals(getIntent().getAction())) {
             if (savedInstanceState != null) {
-                mConfirmingPassCode = savedInstanceState.getBoolean(PassCodeActivity.KEY_CONFIRMING_PASSCODE);
-                mPassCodeDigits = savedInstanceState.getStringArray(PassCodeActivity.KEY_PASSCODE_DIGITS);
+                confirmingPassCode = savedInstanceState.getBoolean(PassCodeActivity.KEY_CONFIRMING_PASSCODE);
+                passCodeDigits = savedInstanceState.getStringArray(PassCodeActivity.KEY_PASSCODE_DIGITS);
             }
-            if(mConfirmingPassCode){
+            if(confirmingPassCode){
                 // the app was in the passcodeconfirmation
                 requestPassCodeConfirmation();
             }else{
@@ -181,43 +178,43 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
      * Binds the appropriate listeners to the input boxes receiving each digit of the pass code.
      */
     protected void setTextListeners() {
-        mPassCodeEditTexts[0].addTextChangedListener(new PassCodeDigitTextWatcher(0, false));
-        mPassCodeEditTexts[1].addTextChangedListener(new PassCodeDigitTextWatcher(1, false));
-        mPassCodeEditTexts[2].addTextChangedListener(new PassCodeDigitTextWatcher(2, false));
-        mPassCodeEditTexts[3].addTextChangedListener(new PassCodeDigitTextWatcher(3, true));
+        passCodeEditTexts[0].addTextChangedListener(new PassCodeDigitTextWatcher(0, false));
+        passCodeEditTexts[1].addTextChangedListener(new PassCodeDigitTextWatcher(1, false));
+        passCodeEditTexts[2].addTextChangedListener(new PassCodeDigitTextWatcher(2, false));
+        passCodeEditTexts[3].addTextChangedListener(new PassCodeDigitTextWatcher(3, true));
 
         setOnKeyListener(1);
         setOnKeyListener(2);
         setOnKeyListener(3);
 
-        mPassCodeEditTexts[1].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(1));
+        passCodeEditTexts[1].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(1));
 
-        mPassCodeEditTexts[2].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(2));
+        passCodeEditTexts[2].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(2));
 
-        mPassCodeEditTexts[3].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(3));
+        passCodeEditTexts[3].setOnFocusChangeListener((v, hasFocus) -> onPassCodeEditTextFocusChange(3));
     }
 
     private void onPassCodeEditTextFocusChange(final int passCodeIndex) {
         for (int i = 0; i < passCodeIndex; i++) {
-            if (TextUtils.isEmpty(mPassCodeEditTexts[i].getText())) {
-                mPassCodeEditTexts[i].requestFocus();
+            if (TextUtils.isEmpty(passCodeEditTexts[i].getText())) {
+                passCodeEditTexts[i].requestFocus();
                 break;
             }
         }
     }
 
     private void setOnKeyListener(final int passCodeIndex) {
-        mPassCodeEditTexts[passCodeIndex].setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
-                mPassCodeEditTexts[passCodeIndex - 1].requestFocus();
-                if (!mConfirmingPassCode) {
-                    mPassCodeDigits[passCodeIndex - 1] = "";
+        passCodeEditTexts[passCodeIndex].setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_DEL && changed) {
+                passCodeEditTexts[passCodeIndex - 1].requestFocus();
+                if (!confirmingPassCode) {
+                    passCodeDigits[passCodeIndex - 1] = "";
                 }
-                mPassCodeEditTexts[passCodeIndex - 1].setText("");
-                mBChange = false;
+                passCodeEditTexts[passCodeIndex - 1].setText("");
+                changed = false;
 
-            } else if (!mBChange) {
-                mBChange = true;
+            } else if (!changed) {
+                changed = true;
             }
             return false;
         });
@@ -255,7 +252,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
         } else if (ACTION_REQUEST_WITH_RESULT.equals(getIntent().getAction())) {
             /// enabling pass code
-            if (!mConfirmingPassCode) {
+            if (!confirmingPassCode) {
                 requestPassCodeConfirmation();
 
             } else if (confirmPassCode()) {
@@ -284,7 +281,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
 
     private void showErrorAndRestart(int errorMessage, int headerMessage,
                                      int explanationVisibility) {
-        Arrays.fill(mPassCodeDigits, null);
+        Arrays.fill(passCodeDigits, null);
         Snackbar.make(findViewById(android.R.id.content), getString(errorMessage), Snackbar.LENGTH_LONG).show();
         binding.header.setText(headerMessage);                          // TODO check if really needed
         binding.explanation.setVisibility(explanationVisibility); // TODO check if really needed
@@ -300,7 +297,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
         clearBoxes();
         binding.header.setText(R.string.pass_code_reenter_your_pass_code);
         binding.explanation.setVisibility(View.INVISIBLE);
-        mConfirmingPassCode = true;
+        confirmingPassCode = true;
     }
 
     /**
@@ -314,8 +311,8 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
         String[] savedPassCodeDigits = preferences.getPassCode();
 
         boolean result = true;
-        for (int i = 0; i < mPassCodeDigits.length && result; i++) {
-            result = mPassCodeDigits[i] != null && mPassCodeDigits[i].equals(savedPassCodeDigits[i]);
+        for (int i = 0; i < passCodeDigits.length && result; i++) {
+            result = passCodeDigits[i] != null && passCodeDigits[i].equals(savedPassCodeDigits[i]);
         }
         return result;
     }
@@ -327,11 +324,11 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
      * @return     'True' if retyped pass code equals to the entered before.
      */
     protected boolean confirmPassCode(){
-        mConfirmingPassCode = false;
+        confirmingPassCode = false;
 
         boolean result = true;
-        for (int i = 0; i < mPassCodeEditTexts.length && result; i++) {
-            result = mPassCodeEditTexts[i].getText().toString().equals(mPassCodeDigits[i]);
+        for (int i = 0; i < passCodeEditTexts.length && result; i++) {
+            result = passCodeEditTexts[i].getText().toString().equals(passCodeDigits[i]);
         }
         return result;
     }
@@ -340,10 +337,10 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
      * Sets the input fields to empty strings and puts the focus on the first one.
      */
     protected void clearBoxes(){
-        for (EditText mPassCodeEditText : mPassCodeEditTexts) {
+        for (EditText mPassCodeEditText : passCodeEditTexts) {
             mPassCodeEditText.setText("");
         }
-        mPassCodeEditTexts[0].requestFocus();
+        passCodeEditTexts[0].requestFocus();
     }
 
     /**
@@ -375,7 +372,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
     protected void savePassCodeAndExit() {
         Intent resultIntent = new Intent();
         resultIntent.putExtra(KEY_PASSCODE,
-                mPassCodeDigits[0] + mPassCodeDigits[1] + mPassCodeDigits[2] + mPassCodeDigits[3]);
+                              passCodeDigits[0] + passCodeDigits[1] + passCodeDigits[2] + passCodeDigits[3]);
 
         setResult(RESULT_OK, resultIntent);
 
@@ -386,8 +383,8 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putBoolean(PassCodeActivity.KEY_CONFIRMING_PASSCODE, mConfirmingPassCode);
-        outState.putStringArray(PassCodeActivity.KEY_PASSCODE_DIGITS, mPassCodeDigits);
+        outState.putBoolean(PassCodeActivity.KEY_CONFIRMING_PASSCODE, confirmingPassCode);
+        outState.putStringArray(PassCodeActivity.KEY_PASSCODE_DIGITS, passCodeDigits);
     }
 
     private class PassCodeDigitTextWatcher implements TextWatcher {
@@ -430,10 +427,10 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
         @Override
         public void afterTextChanged(Editable s) {
             if (s.length() > 0) {
-                if (!mConfirmingPassCode) {
-                    mPassCodeDigits[mIndex] = mPassCodeEditTexts[mIndex].getText().toString();
+                if (!confirmingPassCode) {
+                    passCodeDigits[mIndex] = passCodeEditTexts[mIndex].getText().toString();
                 }
-                mPassCodeEditTexts[next()].requestFocus();
+                passCodeEditTexts[next()].requestFocus();
 
                 if (mLastOne) {
                     processFullPassCode();