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:31 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-09-30 12:45:10 +0200
commit1d0e9bf60a958dce3ee4605dd08c660331e2d171 (patch)
tree155f21088720cc654b34709ee1d0aa355ee02aee /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
parent2535ecb91f99ef5db2cd373a28eddaf99d2c02a4 (diff)
downloadopen-keychain-1d0e9bf60a958dce3ee4605dd08c660331e2d171.tar.gz
open-keychain-1d0e9bf60a958dce3ee4605dd08c660331e2d171.tar.bz2
open-keychain-1d0e9bf60a958dce3ee4605dd08c660331e2d171.zip
Enable 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.java19
1 files changed, 5 insertions, 14 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 579a001cb..e56652d5f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -30,7 +30,6 @@ 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 org.sufficientlysecure.keychain.util.Preferences;
@@ -120,13 +119,9 @@ 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);
- Notify.create(this,
- "YubiKey key creation is currently not supported. Please follow our FAQ.",
- Notify.Style.ERROR
- ).show();
+ Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+ loadFragment(frag, FragAction.START);
+ setTitle(R.string.title_manage_my_keys);
}
// done
@@ -186,12 +181,8 @@ public class CreateKeyActivity extends BaseNfcActivity {
loadFragment(frag, FragAction.TO_RIGHT);
}
} else {
-// 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();
+ Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+ loadFragment(frag, FragAction.TO_RIGHT);
}
}