cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable YubiKey key creation for release

Browse Source
This commit is contained in:
Dominik Schürmann
2015-06-30 12:58:40 +02:00
parent 13bbda1012
commit 340f2e442a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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;
@@ -112,9 +113,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
setTitle(R.string.title_import_keys); setTitle(R.string.title_import_keys);
} else { } else {
Fragment frag = CreateKeyYubiKeyBlankFragment.newInstance(); // Fragment frag = CreateKeyYubiKeyBlankFragment.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
@@ -166,8 +171,12 @@ public class CreateKeyActivity extends BaseNfcActivity {
loadFragment(frag, FragAction.TO_RIGHT); loadFragment(frag, FragAction.TO_RIGHT);
} }
} else { } else {
Fragment frag = CreateKeyYubiKeyBlankFragment.newInstance(); // Fragment frag = CreateKeyYubiKeyBlankFragment.newInstance();
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();
} }
} }