diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-15 16:45:07 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-15 16:45:07 +0200 |
| commit | 93b460a289ae1dde7baa2512010e3db6433fe505 (patch) | |
| tree | d900cadb86c4ddfa7bdf625a3577ccc4d4dc8095 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service | |
| parent | 5aebd115d4a7a8ba7d538621bbf9e88ef941f48c (diff) | |
| download | open-keychain-93b460a289ae1dde7baa2512010e3db6433fe505.tar.gz open-keychain-93b460a289ae1dde7baa2512010e3db6433fe505.tar.bz2 open-keychain-93b460a289ae1dde7baa2512010e3db6433fe505.zip | |
rename encryptAndSign to signAndEncrypt
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 6b459b969..749b46405 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -331,7 +331,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial .getForceV3Signatures()); } else { Log.d(Constants.TAG, "encrypt..."); - operation.encryptAndSign(useAsciiArmor, compressionId, encryptionKeyIds, + operation.signAndEncrypt(useAsciiArmor, compressionId, encryptionKeyIds, encryptionPassphrase, Preferences.getPreferences(this) .getDefaultEncryptionAlgorithm(), secretKeyId, Preferences .getPreferences(this).getDefaultHashAlgorithm(), Preferences diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index 480b88ca5..4b451ecfb 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -242,11 +242,11 @@ public class OpenPgpService extends RemoteService { return; } - operation.encryptAndSign(asciiArmor, appSettings.getCompression(), keyIds, null, + operation.signAndEncrypt(asciiArmor, appSettings.getCompression(), keyIds, null, appSettings.getEncryptionAlgorithm(), appSettings.getKeyId(), appSettings.getHashAlgorithm(), true, passphrase); } else { - operation.encryptAndSign(asciiArmor, appSettings.getCompression(), keyIds, null, + operation.signAndEncrypt(asciiArmor, appSettings.getCompression(), keyIds, null, appSettings.getEncryptionAlgorithm(), Id.key.none, appSettings.getHashAlgorithm(), true, null); } |