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

encrypt to signing key in openkeychain ui

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-06 22:07:47 +02:00
parent 93caae1342
commit 4a4e325bca
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@@ -649,6 +649,9 @@ public class EncryptFilesFragment
data.setEncryptionMasterKeyIds(encryptionKeyIds); data.setEncryptionMasterKeyIds(encryptionKeyIds);
data.setSignatureMasterKeyId(signingKeyId); data.setSignatureMasterKeyId(signingKeyId);
if (signingKeyId != Constants.key.none) {
data.setAdditionalEncryptId(signingKeyId);
}
} else { } else {
Passphrase passphrase = modeFragment.getSymmetricPassphrase(); Passphrase passphrase = modeFragment.getSymmetricPassphrase();
if (passphrase == null) { if (passphrase == null) {

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
View File

@@ -264,6 +264,9 @@ public class EncryptTextFragment
data.setEncryptionMasterKeyIds(encryptionKeyIds); data.setEncryptionMasterKeyIds(encryptionKeyIds);
data.setSignatureMasterKeyId(signingKeyId); data.setSignatureMasterKeyId(signingKeyId);
if (signingKeyId != Constants.key.none) {
data.setAdditionalEncryptId(signingKeyId);
}
} else { } else {
Passphrase passphrase = modeFragment.getSymmetricPassphrase(); Passphrase passphrase = modeFragment.getSymmetricPassphrase();
if (passphrase == null) { if (passphrase == null) {