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

Fix 25519 choice naming

Browse Source
This commit is contained in:
Vincent Breitmoser
2024-01-29 16:13:44 +01:00
parent 7c97829ca9
commit 5615197553
29 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
View File

@@ -62,7 +62,7 @@ public class AddSubkeyDialogFragment extends DialogFragment {
}
public enum SupportedKeyType {
RSA_2048, RSA_3072, RSA_4096, ECC_P256, ECC_P521, EDDSA
RSA_2048, RSA_3072, RSA_4096, ECC_P256, ECC_P521, ECC_25519
}
private static final String ARG_WILL_BE_MASTER_KEY = "will_be_master_key";
@@ -160,8 +160,8 @@ public class AddSubkeyDialogFragment extends DialogFragment {
R.string.ecc_p256), getResources().getString(R.string.ecc_p256_description_html)));
choices.add(new Choice<>(SupportedKeyType.ECC_P521, getResources().getString(
R.string.ecc_p521), getResources().getString(R.string.ecc_p521_description_html)));
choices.add(new Choice<>(SupportedKeyType.EDDSA, getResources().getString(
R.string.ecc_eddsa), getResources().getString(R.string.ecc_eddsa_description_html)));
choices.add(new Choice<>(SupportedKeyType.ECC_25519, getResources().getString(
R.string.ecc_25519), getResources().getString(R.string.ecc_25519_description_html)));
TwoLineArrayAdapter adapter = new TwoLineArrayAdapter(context,
android.R.layout.simple_spinner_item, choices);
mKeyTypeSpinner.setAdapter(adapter);
@@ -202,7 +202,7 @@ public class AddSubkeyDialogFragment extends DialogFragment {
switch (keyType) {
case ECC_P256:
case ECC_P521:
case EDDSA:
case ECC_25519:
signAndEncryptAvailable = false;
if (mWillBeMasterKey) encryptAvailable = false;
break;
@@ -261,7 +261,7 @@ public class AddSubkeyDialogFragment extends DialogFragment {
curve = Curve.NIST_P521;
break;
}
case EDDSA: {
case ECC_25519: {
curve = Curve.CV25519;
break;
}
@@ -285,7 +285,7 @@ public class AddSubkeyDialogFragment extends DialogFragment {
}
break;
}
case EDDSA: {
case ECC_25519: {
if(mUsageEncrypt.isChecked()) {
algorithm = Algorithm.ECDH;
} else {