moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Add option to pass original filename to PgpSignEncrypt

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-11 10:00:24 +02:00
parent 94b7b1b5d8
commit 549feb69ed
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
View File

@ -72,6 +72,7 @@ public class PgpSignEncrypt {
private String mSignaturePassphrase; private String mSignaturePassphrase;
private boolean mEncryptToSigner; private boolean mEncryptToSigner;
private boolean mCleartextInput; private boolean mCleartextInput;
private String mOriginalFilename;
private static byte[] NEW_LINE; private static byte[] NEW_LINE;
@ -102,6 +103,7 @@ public class PgpSignEncrypt {
this.mSignaturePassphrase = builder.mSignaturePassphrase; this.mSignaturePassphrase = builder.mSignaturePassphrase;
this.mEncryptToSigner = builder.mEncryptToSigner; this.mEncryptToSigner = builder.mEncryptToSigner;
this.mCleartextInput = builder.mCleartextInput; this.mCleartextInput = builder.mCleartextInput;
this.mOriginalFilename = builder.mOriginalFilename;
} }
public static class Builder { public static class Builder {
@ -124,12 +126,13 @@ public class PgpSignEncrypt {
private String mSignaturePassphrase = null; private String mSignaturePassphrase = null;
private boolean mEncryptToSigner = false; private boolean mEncryptToSigner = false;
private boolean mCleartextInput = false; private boolean mCleartextInput = false;
private String mOriginalFilename = "";
public Builder(ProviderHelper providerHelper, String versionHeader, InputData data, OutputStream outStream) { public Builder(ProviderHelper providerHelper, String versionHeader, InputData data, OutputStream outStream) {
this.mProviderHelper = providerHelper; mProviderHelper = providerHelper;
this.mVersionHeader = versionHeader; mVersionHeader = versionHeader;
this.mData = data; mData = data;
this.mOutStream = outStream; mOutStream = outStream;
} }
public Builder setProgressable(Progressable progressable) { public Builder setProgressable(Progressable progressable) {
@ -148,12 +151,12 @@ public class PgpSignEncrypt {
} }
public Builder setEncryptionMasterKeyIds(long[] encryptionMasterKeyIds) { public Builder setEncryptionMasterKeyIds(long[] encryptionMasterKeyIds) {
this.mEncryptionMasterKeyIds = encryptionMasterKeyIds; mEncryptionMasterKeyIds = encryptionMasterKeyIds;
return this; return this;
} }
public Builder setSymmetricPassphrase(String symmetricPassphrase) { public Builder setSymmetricPassphrase(String symmetricPassphrase) {
this.mSymmetricPassphrase = symmetricPassphrase; mSymmetricPassphrase = symmetricPassphrase;
return this; return this;
} }
@ -183,11 +186,13 @@ public class PgpSignEncrypt {
} }
/** /**
* Also encrypt with the signing keyring
*
* @param encryptToSigner * @param encryptToSigner
* @return * @return
*/ */
public Builder setEncryptToSigner(boolean encryptToSigner) { public Builder setEncryptToSigner(boolean encryptToSigner) {
this.mEncryptToSigner = encryptToSigner; mEncryptToSigner = encryptToSigner;
return this; return this;
} }
@ -198,7 +203,12 @@ public class PgpSignEncrypt {
* @return * @return
*/ */
public Builder setCleartextInput(boolean cleartextInput) { public Builder setCleartextInput(boolean cleartextInput) {
this.mCleartextInput = cleartextInput; mCleartextInput = cleartextInput;
return this;
}
public Builder setOriginalFilename(String originalFilename) {
mOriginalFilename = originalFilename;
return this; return this;
} }
@ -380,8 +390,7 @@ public class PgpSignEncrypt {
} }
PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator(); PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
// file name not needed, so empty string pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, mOriginalFilename, new Date(),
pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, "", new Date(),
new byte[1 << 16]); new byte[1 << 16]);
long alreadyWritten = 0; long alreadyWritten = 0;
@ -472,8 +481,7 @@ public class PgpSignEncrypt {
} }
PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator(); PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
// file name not needed, so empty string pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, mOriginalFilename, new Date(),
pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, "", new Date(),
new byte[1 << 16]); new byte[1 << 16]);
long alreadyWritten = 0; long alreadyWritten = 0;