moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-28 03:22:19 -05:00
Code Issues Releases Wiki Activity

keep track of brand new keys, they need saving

Browse Source
This commit is contained in:
Ashley Hughes 2014-02-08 15:59:44 +00:00
parent 44ee713763
commit 5def251e62
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
View File

@ -100,6 +100,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
private String mSavedNewPassPhrase = null; private String mSavedNewPassPhrase = null;
private boolean mIsPassPhraseSet; private boolean mIsPassPhraseSet;
private boolean mNeedsSaving; private boolean mNeedsSaving;
private boolean mIsBrandNewKeyring = false;
private MenuItem mSaveButton; private MenuItem mSaveButton;
private BootstrapButton mChangePassPhrase; private BootstrapButton mChangePassPhrase;
@ -118,6 +119,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
mNeedsSaving = (mUserIdsView == null) ? false : mUserIdsView.needsSaving(); mNeedsSaving = (mUserIdsView == null) ? false : mUserIdsView.needsSaving();
mNeedsSaving |= (mKeysView == null) ? false : mKeysView.needsSaving(); mNeedsSaving |= (mKeysView == null) ? false : mKeysView.needsSaving();
mNeedsSaving |= hasPassphraseChanged(); mNeedsSaving |= hasPassphraseChanged();
mNeedsSaving |= mIsBrandNewKeyring;
return mNeedsSaving; return mNeedsSaving;
} }
@ -171,6 +173,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
mCurrentPassPhrase = ""; mCurrentPassPhrase = "";
mIsBrandNewKeyring = true;
if (extras != null) { if (extras != null) {
// if userId is given, prefill the fields // if userId is given, prefill the fields
@ -616,7 +619,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
} }
private void cancelClicked() { private void cancelClicked() {
if (mNeedsSaving) { //ask if we want to save if (needsSaving()) { //ask if we want to save
AlertDialog.Builder alert = new AlertDialog.Builder( AlertDialog.Builder alert = new AlertDialog.Builder(
EditKeyActivity.this); EditKeyActivity.this);