diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 22:50:34 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 22:50:34 +0200 |
| commit | cac7c3234a6ee1d25f46a9179645e01c1c0512c2 (patch) | |
| tree | f6e8cdb715249084322740605e5758c312502f00 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
| parent | c03dee6fe2f60717f448178dcf49d370dce0bab0 (diff) | |
| download | open-keychain-cac7c3234a6ee1d25f46a9179645e01c1c0512c2.tar.gz open-keychain-cac7c3234a6ee1d25f46a9179645e01c1c0512c2.tar.bz2 open-keychain-cac7c3234a6ee1d25f46a9179645e01c1c0512c2.zip | |
Support backupVersion ASCII Armor header
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java index 5886f000c..1ec43b625 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java @@ -142,6 +142,7 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> { PgpSignEncryptInputParcel inputParcel = new PgpSignEncryptInputParcel(); inputParcel.setSymmetricPassphrase(exportInput.mSymmetricPassphrase); inputParcel.setEnableAsciiArmorOutput(true); + inputParcel.setAddBackupHeader(true); InputStream inStream = mContext.getContentResolver().openInputStream(exportOutputUri); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 24d1215d4..382d6c46d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -639,6 +639,7 @@ public abstract class OperationResult implements Parcelable { MSG_DC_ASKIP_NOT_ALLOWED (LogLevel.DEBUG, R.string.msg_dc_askip_not_allowed), MSG_DC_ASYM (LogLevel.DEBUG, R.string.msg_dc_asym), MSG_DC_CHARSET (LogLevel.DEBUG, R.string.msg_dc_charset), + MSG_DC_BACKUP_VERSION (LogLevel.DEBUG, R.string.msg_dc_backup_version), MSG_DC_CLEAR_DATA (LogLevel.DEBUG, R.string.msg_dc_clear_data), MSG_DC_CLEAR_DECOMPRESS (LogLevel.DEBUG, R.string.msg_dc_clear_decompress), MSG_DC_CLEAR_META_FILE (LogLevel.DEBUG, R.string.msg_dc_clear_meta_file), |