aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 16:43:02 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 16:43:02 +0200
commit841d3caee563274e1d91a18ed1caec174e1928dd (patch)
tree85ca8cfa2b7a69d15cd6b669f7b06ef2cdc9257c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
parent7f20a84eafbb40491450add5307d39b23b7a7748 (diff)
downloadopen-keychain-841d3caee563274e1d91a18ed1caec174e1928dd.tar.gz
open-keychain-841d3caee563274e1d91a18ed1caec174e1928dd.tar.bz2
open-keychain-841d3caee563274e1d91a18ed1caec174e1928dd.zip
Disable YubiKey creation
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.java21
1 files changed, 15 insertions, 6 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 9326ff129..f320f3945 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -30,6 +30,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Passphrase;
import java.io.IOException;
@@ -118,9 +119,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
setTitle(R.string.title_import_keys);
} else {
- Fragment frag = CreateYubiKeyBlankFragment.newInstance();
- loadFragment(frag, FragAction.START);
- setTitle(R.string.title_manage_my_keys);
+// Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+// loadFragment(frag, FragAction.START);
+// setTitle(R.string.title_manage_my_keys);
+ Notify.create(this,
+ "YubiKey key creation is currently not supported. Please follow our FAQ.",
+ Notify.Style.ERROR
+ ).show();
}
// done
@@ -175,9 +180,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
finish();
} catch (PgpKeyNotFoundException e) {
- Fragment frag = CreateYubiKeyImportFragment.newInstance(
- mScannedFingerprints, mNfcAid, mNfcUserId);
- loadFragment(frag, FragAction.TO_RIGHT);
+// 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();
}
} else {
Fragment frag = CreateYubiKeyBlankFragment.newInstance();