mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-04 08:15:02 -05:00
Merge branch 'master' of github.com:open-keychain/open-keychain
This commit is contained in:
commit
9475c4d91a
@ -434,7 +434,13 @@ public class PgpSignEncrypt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
|
PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
|
||||||
pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, mOriginalFilename, new Date(),
|
char literalDataFormatTag;
|
||||||
|
if (mCleartextInput) {
|
||||||
|
literalDataFormatTag = PGPLiteralData.UTF8;
|
||||||
|
} else {
|
||||||
|
literalDataFormatTag = PGPLiteralData.BINARY;
|
||||||
|
}
|
||||||
|
pOut = literalGen.open(bcpgOut, literalDataFormatTag, mOriginalFilename, new Date(),
|
||||||
new byte[1 << 16]);
|
new byte[1 << 16]);
|
||||||
|
|
||||||
long alreadyWritten = 0;
|
long alreadyWritten = 0;
|
||||||
|
@ -14,5 +14,4 @@ include ':extern:minidns'
|
|||||||
include ':extern:KeybaseLib:Lib'
|
include ':extern:KeybaseLib:Lib'
|
||||||
include ':extern:TokenAutoComplete:library'
|
include ':extern:TokenAutoComplete:library'
|
||||||
include ':extern:openpgp-card-nfc-lib:library'
|
include ':extern:openpgp-card-nfc-lib:library'
|
||||||
include ':extern:safeslinger-exchange'
|
include ':extern:safeslinger-exchange'
|
||||||
include ':OpenKeychain-Test'
|
|
Loading…
Reference in New Issue
Block a user