Require old passcode to change passcode

Author: aint

app/src/main/java/org/gnucash/android/ui/passcode/PasscodePreferenceActivity.java

@@ -18,6 +18,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -36,14 +37,40 @@ public class PasscodePreferenceActivity extends SherlockFragmentActivity
     private boolean reenter = false;
     private String passcode;
 
+    private boolean checkOldPassCode;
+
+    private TextView passCodeTextView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.passcode_lockscreen);
+
+        passCodeTextView= (TextView) findViewById(R.id.passcode_label);
+
+        checkOldPassCode = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
+                .getBoolean(UxArgument.ENABLED_PASSCODE, false);
+
+        if (checkOldPassCode) {
+            passCodeTextView.setText("Enter your old passcode");
+        }
     }
 
     @Override
     public void onPasscodeEntered(String pass) {
+        String passCode = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
+                .getString(UxArgument.PASSCODE, "");
+
+        if (checkOldPassCode) {
+            if (pass.equals(passCode)) {
+                checkOldPassCode = false;
+                passCodeTextView.setText("Enter your new passcode");
+            } else {
+                Toast.makeText(this, R.string.toast_wrong_passcode, Toast.LENGTH_SHORT).show();
+            }
+            return;
+        }
+
         if (reenter) {
             if (passcode.equals(pass)) {
                 setResult(RESULT_OK, new Intent().putExtra(UxArgument.PASSCODE, pass));
@@ -58,4 +85,5 @@ public void onPasscodeEntered(String pass) {
             Toast.makeText(this, R.string.toast_confirm_passcode, Toast.LENGTH_SHORT).show();
         }
     }
+
 }

app/src/main/java/org/gnucash/android/ui/settings/PasscodePreferenceFragment.java

@@ -51,6 +51,10 @@ public class PasscodePreferenceFragment extends PreferenceFragment {
      * Request code for disabling passcode
      */
     public static final int REQUEST_DISABLE_PASSCODE = 3;
+    /**
+     * Request code for changing passcode
+     */
+    public static final int REQUEST_CHANGE_PASSCODE = 4;
 
     private SharedPreferences.Editor editor;
     private CheckBoxPreference checkBoxPreference;
@@ -87,16 +91,16 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                             passIntent.putExtra(UxArgument.DISABLE_PASSCODE, UxArgument.DISABLE_PASSCODE);
                             startActivityForResult(passIntent, REQUEST_DISABLE_PASSCODE);
                         }
-                        editor.putBoolean(UxArgument.ENABLED_PASSCODE, (Boolean) newValue);
-                        editor.commit();
+//                        editor.putBoolean(UxArgument.ENABLED_PASSCODE, (Boolean) newValue);
+//                        editor.commit();
                         return true;
                     }
                 });
         findPreference(getString(R.string.key_change_passcode))
                 .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        startActivityForResult(intent, PASSCODE_REQUEST_CODE);
+                        startActivityForResult(intent, REQUEST_CHANGE_PASSCODE);
                         return true;
                     }
                 });
@@ -125,6 +129,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 editor.putBoolean(UxArgument.ENABLED_PASSCODE, flag);
                 checkBoxPreference.setChecked(flag);
                 break;
+            case REQUEST_CHANGE_PASSCODE:
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    editor.putString(UxArgument.PASSCODE, data.getStringExtra(UxArgument.PASSCODE));
+                    editor.putBoolean(UxArgument.ENABLED_PASSCODE, true);
+                    Toast.makeText(getActivity(), R.string.toast_passcode_set, Toast.LENGTH_SHORT).show();
+                    checkBoxPreference.setTitle(getString(R.string.title_passcode_enabled));
+                }
+                break;
         }
         editor.commit();
     }