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

fix create keyring crash

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

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

@ -115,8 +115,8 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
public boolean needsSaving() public boolean needsSaving()
{ {
mNeedsSaving = mUserIdsView.needsSaving(); mNeedsSaving = (mUserIdsView == null) ? false : mUserIdsView.needsSaving();
mNeedsSaving |= mKeysView.needsSaving(); mNeedsSaving |= (mKeysView == null) ? false : mKeysView.needsSaving();
mNeedsSaving |= hasPassphraseChanged(); mNeedsSaving |= hasPassphraseChanged();
return mNeedsSaving; return mNeedsSaving;
} }
@ -515,10 +515,14 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
public boolean hasPassphraseChanged() public boolean hasPassphraseChanged()
{ {
if (mNoPassphrase.isChecked()) { if (mNoPassphrase != null) {
return mIsPassPhraseSet; if (mNoPassphrase.isChecked()) {
} else { return mIsPassPhraseSet;
return (mNewPassPhrase != null && !mNewPassPhrase.equals("")); } else {
return (mNewPassPhrase != null && !mNewPassPhrase.equals(""));
}
}else {
return false;
} }
} }