moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

rename encryptAndSign to signAndEncrypt

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-15 16:45:07 +02:00
parent 5aebd115d4
commit 93b460a289
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
View File

@ -111,30 +111,7 @@ public class PgpOperation {
}
}
/**
* Encrypt and Sign data
*
* @param mContext
* @param mProgress
* @param mData
* @param mOutStream
* @param useAsciiArmor
* @param compression
* @param encryptionKeyIds
* @param symmetricEncryptionAlgorithm
* @param encryptionPassphrase
* @param signatureKeyId
* @param signatureHashAlgorithm
* @param signatureForceV3
* @param signaturePassphrase
* @throws IOException
* @throws PgpGeneralException
* @throws PGPException
* @throws NoSuchProviderException
* @throws NoSuchAlgorithmException
* @throws SignatureException
*/
public void encryptAndSign(boolean useAsciiArmor, int compression, long[] encryptionKeyIds,
public void signAndEncrypt(boolean useAsciiArmor, int compression, long[] encryptionKeyIds,
String encryptionPassphrase, int symmetricEncryptionAlgorithm, long signatureKeyId,
int signatureHashAlgorithm, boolean signatureForceV3, String signaturePassphrase)
throws IOException, PgpGeneralException, PGPException, NoSuchProviderException,

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -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

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
View File

@ -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);
}