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

Merge branch 'ui-createkey'

Browse Source
This commit is contained in:
Daniel Hammann 2014-03-23 18:32:19 +01:00
commit 3d9cc7fc56
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,11 +495,10 @@ public class EditKeyActivity extends ActionBarActivity {
private void saveClicked() { private void saveClicked() {
long masterKeyId = getMasterKeyId(); long masterKeyId = getMasterKeyId();
try { if (!isPassphraseSet()) {
if (!isPassphraseSet()) { Log.e(Constants.TAG, "No passphrase has been set");
throw new PgpGeneralException(this.getString(R.string.set_a_passphrase)); Toast.makeText(this, R.string.set_a_passphrase, Toast.LENGTH_LONG).show();
} } else {
String passphrase = null; String passphrase = null;
if (mIsPassPhraseSet) { if (mIsPassPhraseSet) {
passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId); passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
@ -512,9 +511,6 @@ public class EditKeyActivity extends ActionBarActivity {
mCurrentPassphrase = passphrase; mCurrentPassphrase = passphrase;
finallySaveClicked(); finallySaveClicked();
} }
} catch (PgpGeneralException e) {
//Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
// Toast.LENGTH_SHORT).show();
} }
} }
@ -576,8 +572,9 @@ public class EditKeyActivity extends ActionBarActivity {
// start service with intent // start service with intent
startService(intent); startService(intent);
} catch (PgpGeneralException e) { } catch (PgpGeneralException e) {
//Toast.makeText(this, getString(R.string.error_message, e.getMessage()), Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
// Toast.LENGTH_SHORT).show(); Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
Toast.LENGTH_SHORT).show();
} }
} }