aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 14:14:39 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 14:14:39 +0200
commit4760f3f260c0810f19d4bd1206a95e446b6d931d (patch)
treea901e43c2ab68bfa57245f8f113818e294cc153e /OpenKeychain
parent1ffcffae150806ceb970230f34dc53a49b6a0594 (diff)
downloadopen-keychain-4760f3f260c0810f19d4bd1206a95e446b6d931d.tar.gz
open-keychain-4760f3f260c0810f19d4bd1206a95e446b6d931d.tar.bz2
open-keychain-4760f3f260c0810f19d4bd1206a95e446b6d931d.zip
Fix YubiKey import
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java18
1 files changed, 9 insertions, 9 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 f320f3945..83b176680 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -180,17 +180,17 @@ public class CreateKeyActivity extends BaseNfcActivity {
finish();
} catch (PgpKeyNotFoundException e) {
-// Fragment frag = CreateYubiKeyImportFragment.newInstance(
-// mScannedFingerprints, mNfcAid, mNfcUserId);
-// loadFragment(frag, FragAction.TO_RIGHT);
- Notify.create(this,
- "YubiKey key creation is currently not supported. Please follow our FAQ.",
- Notify.Style.ERROR
- ).show();
+ Fragment frag = CreateYubiKeyImportFragment.newInstance(
+ mScannedFingerprints, mNfcAid, mNfcUserId);
+ loadFragment(frag, FragAction.TO_RIGHT);
}
} else {
- Fragment frag = CreateYubiKeyBlankFragment.newInstance();
- loadFragment(frag, FragAction.TO_RIGHT);
+// Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+// loadFragment(frag, FragAction.TO_RIGHT);
+ Notify.create(this,
+ "YubiKey key creation is currently not supported. Please follow our FAQ.",
+ Notify.Style.ERROR
+ ).show();
}
}