kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set default preferences (length 20, .etc) on first use of generator, only save preferences when they've been used to generate i.e. Generate pressed

Browse source
This commit is contained in:
Matthew Wong 2015-07-11 12:51:00 -04:00
parent 20da17c2d8
commit 32cf7f7813
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
View file

@ -55,13 +55,9 @@ public class pwgenDialogFragment extends DialogFragment {
TextView textView = (TextView) view.findViewById(R.id.lengthNumber); TextView textView = (TextView) view.findViewById(R.id.lengthNumber);
textView.setText(Integer.toString(prefs.getInt("length", 20))); textView.setText(Integer.toString(prefs.getInt("length", 20)));
textView = (TextView) view.findViewById(R.id.passwordText);
textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
builder.setPositiveButton(getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() { builder.setPositiveButton(getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
pwgenDialogFragment.this.setPreferences();
TextView edit = (TextView) pwgenDialogFragment.this.getActivity().findViewById(R.id.crypto_password_edit); TextView edit = (TextView) pwgenDialogFragment.this.getActivity().findViewById(R.id.crypto_password_edit);
TextView generate = (TextView) pwgenDialogFragment.this.getDialog().findViewById(R.id.passwordText); TextView generate = (TextView) pwgenDialogFragment.this.getDialog().findViewById(R.id.passwordText);
edit.append(generate.getText()); edit.append(generate.getText());
@ -81,13 +77,17 @@ public class pwgenDialogFragment extends DialogFragment {
ad.setOnShowListener(new DialogInterface.OnShowListener() { ad.setOnShowListener(new DialogInterface.OnShowListener() {
@Override @Override
public void onShow(DialogInterface dialog) { public void onShow(DialogInterface dialog) {
setPreferences();
TextView textView = (TextView) view.findViewById(R.id.passwordText);
textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL); Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL);
b.setOnClickListener(new View.OnClickListener() { b.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
pwgenDialogFragment.this.setPreferences(); setPreferences();
TextView textView1 = (TextView) pwgenDialogFragment.this.getDialog().findViewById(R.id.passwordText); TextView textView = (TextView) getDialog().findViewById(R.id.passwordText);
textView1.setText(pwgen.generate(pwgenDialogFragment.this.getActivity().getApplicationContext()).get(0)); textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
} }
}); });
} }
@ -97,7 +97,7 @@ public class pwgenDialogFragment extends DialogFragment {
private boolean setPreferences () { private boolean setPreferences () {
ArrayList<String> preferences = new ArrayList<>(); ArrayList<String> preferences = new ArrayList<>();
if (!((CheckBox)getDialog().findViewById(R.id.numerals)).isChecked()) { if (!((CheckBox) getDialog().findViewById(R.id.numerals)).isChecked()) {
preferences.add("0"); preferences.add("0");
} }
if (((CheckBox) getDialog().findViewById(R.id.symbols)).isChecked()) { if (((CheckBox) getDialog().findViewById(R.id.symbols)).isChecked()) {