PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Disable YubiKey creation

Browse source
This commit is contained in:
Dominik Schürmann 2015-07-06 16:43:02 +02:00
parent 7f20a84eaf
commit 841d3caee5
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View file

@ -30,6 +30,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity; import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; 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.Passphrase;
import java.io.IOException; import java.io.IOException;
@ -118,9 +119,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
setTitle(R.string.title_import_keys); setTitle(R.string.title_import_keys);
} else { } else {
Fragment frag = CreateYubiKeyBlankFragment.newInstance(); // Fragment frag = CreateYubiKeyBlankFragment.newInstance();
loadFragment(frag, FragAction.START); // loadFragment(frag, FragAction.START);
setTitle(R.string.title_manage_my_keys); // 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 // done
@ -175,9 +180,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
finish(); finish();
} catch (PgpKeyNotFoundException e) { } catch (PgpKeyNotFoundException e) {
Fragment frag = CreateYubiKeyImportFragment.newInstance( // Fragment frag = CreateYubiKeyImportFragment.newInstance(
mScannedFingerprints, mNfcAid, mNfcUserId); // mScannedFingerprints, mNfcAid, mNfcUserId);
loadFragment(frag, FragAction.TO_RIGHT); // loadFragment(frag, FragAction.TO_RIGHT);
Notify.create(this,
"YubiKey key creation is currently not supported. Please follow our FAQ.",
Notify.Style.ERROR
).show();
} }
} else { } else {
Fragment frag = CreateYubiKeyBlankFragment.newInstance(); Fragment frag = CreateYubiKeyBlankFragment.newInstance();