diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 22:09:12 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-13 22:09:12 +0200 |
| commit | 9475c4d91aaf84cea4878a52cf30cc2b2c20b283 (patch) | |
| tree | f271fe446a8f7e9c94eeca14924f2702a1983f36 | |
| parent | ff65733ed337f0eb43c09d790408f59d7d115e13 (diff) | |
| parent | bcbf96e61bed69588ef4542e0c282e12896e8ae7 (diff) | |
| download | open-keychain-9475c4d91aaf84cea4878a52cf30cc2b2c20b283.tar.gz open-keychain-9475c4d91aaf84cea4878a52cf30cc2b2c20b283.tar.bz2 open-keychain-9475c4d91aaf84cea4878a52cf30cc2b2c20b283.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java | 8 | ||||
| -rw-r--r-- | settings.gradle | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index d82c68316..070239a80 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -434,7 +434,13 @@ public class PgpSignEncrypt { } 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]); long alreadyWritten = 0; diff --git a/settings.gradle b/settings.gradle index 997dcc838..3e232d229 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,5 +14,4 @@ include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:TokenAutoComplete:library' include ':extern:openpgp-card-nfc-lib:library' -include ':extern:safeslinger-exchange' -include ':OpenKeychain-Test' +include ':extern:safeslinger-exchange'
\ No newline at end of file |