From ffc28f408e73fd78f951260e3b7c894c9c0528e6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 13 Apr 2018 19:34:34 +0200
Subject: [PATCH] Drop support for BackupVersion header in
 PgpSignEncryptOperation

---
 .../sufficientlysecure/keychain/pgp/PgpSignEncryptData.java   | 3 ---
 .../keychain/pgp/PgpSignEncryptOperation.java                 | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
index afdb8963c..294992655 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
@@ -58,7 +58,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
     public abstract boolean isEnableAsciiArmorOutput();
     public abstract boolean isCleartextSignature();
     public abstract boolean isDetachedSignature();
-    public abstract boolean isAddBackupHeader();
     public abstract boolean isHiddenRecipients();
 
     @Nullable
@@ -73,7 +72,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
                 .setEnableAsciiArmorOutput(false)
                 .setCleartextSignature(false)
                 .setDetachedSignature(false)
-                .setAddBackupHeader(false)
                 .setHiddenRecipients(false)
                 .setCompressionAlgorithm(OpenKeychainCompressionAlgorithmTags.USE_DEFAULT)
                 .setSignatureHashAlgorithm(OpenKeychainHashAlgorithmTags.USE_DEFAULT)
@@ -96,7 +94,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
         public abstract Builder setSignatureHashAlgorithm(int signatureHashAlgorithm);
         public abstract Builder setSymmetricEncryptionAlgorithm(int symmetricEncryptionAlgorithm);
 
-        public abstract Builder setAddBackupHeader(boolean isAddBackupHeader);
         public abstract Builder setEnableAsciiArmorOutput(boolean enableAsciiArmorOutput);
         public abstract Builder setCleartextSignature(boolean isCleartextSignature);
         public abstract Builder setDetachedSignature(boolean isDetachedSignature);
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 e9ac655f6..bf24bebfb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
@@ -202,10 +202,6 @@ public class PgpSignEncryptOperation extends BaseOperation<PgpSignEncryptInputPa
             if (data.getCharset() != null) {
                 armorOut.setHeader("Charset", data.getCharset());
             }
-            // add proprietary header to indicate that this is a key backup
-            if (data.isAddBackupHeader()) {
-                armorOut.setHeader("BackupVersion", "2");
-            }
             String passphraseFormat = data.getPassphraseFormat();
             if (passphraseFormat != null) {
                 armorOut.setHeader("Passphrase-Format", passphraseFormat);