diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
| commit | b430ba51eb1df64c3386a824fe8fbddcc9c00ece (patch) | |
| tree | f85b366ea817babd2bd2bc9055b79c32a56fbb3d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
| parent | bd8e45b55680d71190c5c565dc144dc5d940ea89 (diff) | |
| download | open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.gz open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.bz2 open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.zip | |
do nfc dispatching in MainActivity
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 | 7 |
1 files changed, 7 insertions, 0 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 4cba62d5b..ee57dd319 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -494,4 +494,11 @@ public class ImportKeysActivity extends BaseNfcActivity { } } + @Override + protected void onNfcPerform() throws IOException { + // this displays the key or moves to the yubikey import dialogue. + super.onNfcPerform(); + // either way, finish afterwards + finish(); + } } |