diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-10 03:00:42 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-10 03:00:42 +0200 |
commit | 6e326fb000e4fbe11452671d14dce02cade1d292 (patch) | |
tree | af2f5d61d8fd1f254c9840ecd9e13ee76eb92ea1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | b1ccfc6276faff554f6373cb4cf7d7b1757344e6 (diff) | |
download | open-keychain-6e326fb000e4fbe11452671d14dce02cade1d292.tar.gz open-keychain-6e326fb000e4fbe11452671d14dce02cade1d292.tar.bz2 open-keychain-6e326fb000e4fbe11452671d14dce02cade1d292.zip |
Add self-encrypt for old API
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index badc3c131..4a8bf9332 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -417,6 +417,20 @@ public class OpenPgpService extends RemoteService { .setAdditionalEncryptId(signKeyId); // add sign key for encryption } + // OLD: Even if the message is not signed: Do self-encrypt to account key id + if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) < 7) { + String accName = data.getStringExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME); + // if no account name is given use name "default" + if (TextUtils.isEmpty(accName)) { + accName = "default"; + } + final AccountSettings accSettings = getAccSettings(accName); + if (accSettings == null || (accSettings.getKeyId() == Constants.key.none)) { + return getCreateAccountIntent(data, accName); + } + pseInput.setAdditionalEncryptId(accSettings.getKeyId()); + } + CryptoInputParcel inputParcel = CryptoInputParcelCacheService.getCryptoInputParcel(this, data); if (inputParcel == null) { inputParcel = new CryptoInputParcel(); |