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

small extra check

Browse Source
This commit is contained in:
Ashley Hughes 2014-02-08 12:12:17 +00:00
parent 8d1047d05c
commit cd2b493ea8
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,7 +326,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
cancelClicked(); cancelClicked(); //TODO: why isn't this triggered on my tablet - one of many ui problems I've had with this device. A code compatibility issue or a Samsung fail?
return true; return true;
case R.id.menu_key_edit_cancel: case R.id.menu_key_edit_cancel:
cancelClicked(); cancelClicked();
@ -520,6 +520,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
private void saveClicked() { private void saveClicked() {
long masterKeyId = getMasterKeyId(); long masterKeyId = getMasterKeyId();
if (needsSaving()) { //make sure, as some versions don't support invalidateOptionsMenu
try { try {
if (!isPassphraseSet()) { if (!isPassphraseSet()) {
throw new PgpGeneralException(this.getString(R.string.set_a_passphrase)); throw new PgpGeneralException(this.getString(R.string.set_a_passphrase));
@ -537,8 +538,9 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
finallySaveClicked(); finallySaveClicked();
} }
} catch (PgpGeneralException e) { } catch (PgpGeneralException e) {
//Toast.makeText(this, getString(R.string.error_message, e.getMessage()), Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
// Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
}
} }
} }