aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-01 17:28:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-01 17:28:43 +0200
commit7c79902a82602ff4e25b03e1232faa1a1768ba16 (patch)
tree03ec60c97bd961436ffffe17ad6917db768bfafa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
parent7f1dbccb5b1640482e9b83391400506f4ad40e04 (diff)
parent4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 (diff)
downloadopen-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/ViewKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 2279a5cde..4b3889737 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -555,7 +555,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
}
@Override
- protected void onNfcPostExecute() throws IOException {
+ protected void onNfcPostExecute() {
long yubiKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mNfcFingerprints);