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

enable encrypt for eddsa; fix key usage spinner

Browse Source
This commit is contained in:
segfault-bilibili
2023-03-18 10:45:40 +08:00
committed by Vincent Breitmoser
parent 5f0646b7e9
commit 7c97829ca9
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,19 +197,18 @@ public class AddSubkeyDialogFragment extends DialogFragment {
mUsageNone.setChecked(true);
}
if (keyType == SupportedKeyType.ECC_P521 || keyType == SupportedKeyType.ECC_P256) {
mUsageSignAndEncrypt.setEnabled(false);
if (mWillBeMasterKey) {
mUsageEncrypt.setEnabled(false);
}
} else if (keyType == SupportedKeyType.EDDSA) {
mUsageSignAndEncrypt.setEnabled(false);
mUsageEncrypt.setEnabled(false);
} else {
// need to enable if previously disabled for ECC masterkey
mUsageEncrypt.setEnabled(true);
mUsageSignAndEncrypt.setEnabled(true);
boolean signAndEncryptAvailable = true;
boolean encryptAvailable = true;
switch (keyType) {
case ECC_P256:
case ECC_P521:
case EDDSA:
signAndEncryptAvailable = false;
if (mWillBeMasterKey) encryptAvailable = false;
break;
}
mUsageSignAndEncrypt.setEnabled(signAndEncryptAvailable);
mUsageEncrypt.setEnabled(encryptAvailable);
}
@Override