aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-21 22:18:58 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-21 22:18:58 +0100
commit04c7639a5a9b4f85122b7d5f299ba09131ce3036 (patch)
treefc4bf4afbca231d107b445487572d24165d2d455 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
parent1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 (diff)
downloadopen-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.tar.gz
open-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.tar.bz2
open-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.zip
split up wait/action yubikey fragments
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
index 9919e2aab..5c2fcde82 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -84,7 +84,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
protected void onNfcPerform() throws IOException {
if (mCurrentFragment instanceof NfcListenerFragment) {
((NfcListenerFragment) mCurrentFragment).onNfcPerform();
+ return;
}
+
+ byte[] scannedFingerprint = nfcGetFingerprint(0);
+ Fragment frag = CreateKeyYubiFragment.createInstance(scannedFingerprint);
+ loadFragment(frag, FragAction.TO_RIGHT);
+
}
@Override