diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
commit | 7c79902a82602ff4e25b03e1232faa1a1768ba16 (patch) | |
tree | 03ec60c97bd961436ffffe17ad6917db768bfafa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | 7f1dbccb5b1640482e9b83391400506f4ad40e04 (diff) | |
parent | 4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 (diff) | |
download | open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.gz open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.bz2 open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.zip |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 425a6755c..7f7532ddf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -377,7 +377,7 @@ public class ImportKeysActivity extends BaseNfcActivity } @Override - protected void onNfcPostExecute() throws IOException { + protected void onNfcPostExecute() { // either way, finish after NFC AsyncTask finish(); } |