diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
| commit | 6cf7e3e541ff954f5f9065ab52e6cee93c0643d3 (patch) | |
| tree | 090937fb456a6fa594a49cafffd1de01a3c35e48 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | |
| parent | 7619083d5c0a7a2ca0c6ed4a6f8317b31ca005f5 (diff) | |
| parent | ba9b8f3a6009ca60abffccc3e3fbd160e0fa420c (diff) | |
| download | open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.gz open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.bz2 open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.zip | |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java index 0879181a7..ecc190d97 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -492,9 +492,7 @@ public class PgpSignEncryptOperation extends BaseOperation { literalGen.close(); } else { - pOut = null; - // TODO: Is this log right? - log.add(LogType.MSG_PSE_CLEARSIGN_ONLY, indent); + throw new AssertionError("cannot clearsign in non-ascii armored text, this is a bug!"); } if (enableSignature) { |