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-06-30 13:39:37 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-06-30 13:39:37 +0200
commitddf7f5006203d0da087cc46321504530a02d6ebf (patch)
tree5fdeafa13d64f8cd0eac797ef804ff05c57be45f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
parentbb89d77665ad014c1d9a30468c7ed2020137830c (diff)
downloadopen-keychain-ddf7f5006203d0da087cc46321504530a02d6ebf.tar.gz
open-keychain-ddf7f5006203d0da087cc46321504530a02d6ebf.tar.bz2
open-keychain-ddf7f5006203d0da087cc46321504530a02d6ebf.zip
Revert "Disable YubiKey key creation for release"
This reverts commit 340f2e442a93e4b3ab2c223fc4ab679f09f75ecd.
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 c72dbde16..505638c7c 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 java.io.IOException;
@@ -113,13 +112,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
setTitle(R.string.title_import_keys);
} else {
-// Fragment frag = CreateKeyYubiKeyBlankFragment.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 = CreateKeyYubiKeyBlankFragment.newInstance();
+ loadFragment(frag, FragAction.START);
+ setTitle(R.string.title_manage_my_keys);
}
// done
@@ -171,12 +166,8 @@ public class CreateKeyActivity extends BaseNfcActivity {
loadFragment(frag, FragAction.TO_RIGHT);
}
} else {
-// Fragment frag = CreateKeyYubiKeyBlankFragment.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 = CreateKeyYubiKeyBlankFragment.newInstance();
+ loadFragment(frag, FragAction.TO_RIGHT);
}
}