Dont write version header by default

1 files changed, 10 insertions, 4 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 4973f64bb..b0e546662 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -109,11 +109,11 @@ public class PgpSignEncrypt {
     public static class Builder {
         // mandatory parameter
         private ProviderHelper mProviderHelper;
-        private String mVersionHeader;
         private InputData mData;
         private OutputStream mOutStream;
 
         // optional
+        private String mVersionHeader = null;
         private Progressable mProgressable = null;
         private boolean mEnableAsciiArmorOutput = false;
         private int mCompressionId = CompressionAlgorithmTags.UNCOMPRESSED;
@@ -128,13 +128,17 @@ public class PgpSignEncrypt {
         private boolean mCleartextInput = false;
         private String mOriginalFilename = "";
 
-        public Builder(ProviderHelper providerHelper, String versionHeader, InputData data, OutputStream outStream) {
+        public Builder(ProviderHelper providerHelper, InputData data, OutputStream outStream) {
             mProviderHelper = providerHelper;
-            mVersionHeader = versionHeader;
             mData = data;
             mOutStream = outStream;
         }
 
+        public Builder setVersionHeader(String versionHeader) {
+            mVersionHeader = versionHeader;
+            return this;
+        }
+
         public Builder setProgressable(Progressable progressable) {
             mProgressable = progressable;
             return this;
@@ -271,7 +275,9 @@ public class PgpSignEncrypt {
         OutputStream out;
         if (mEnableAsciiArmorOutput) {
             armorOut = new ArmoredOutputStream(mOutStream);
-            armorOut.setHeader("Version", mVersionHeader);
+            if (mVersionHeader != null) {
+                armorOut.setHeader("Version", mVersionHeader);
+            }
             out = armorOut;
         } else {
             out = mOutStream;