diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-05-17 20:59:07 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-05-17 20:59:07 +0200 |
commit | 1da8e4c1edd71b2ddbe95a58060c1be20bd13dd7 (patch) | |
tree | 884eed850d90f3f17af26a1b49a20b2e9a4e3102 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | f833b0f2ef206f9dc2656628bca460fd2a8ab54b (diff) | |
download | open-keychain-1da8e4c1edd71b2ddbe95a58060c1be20bd13dd7.tar.gz open-keychain-1da8e4c1edd71b2ddbe95a58060c1be20bd13dd7.tar.bz2 open-keychain-1da8e4c1edd71b2ddbe95a58060c1be20bd13dd7.zip |
make unencrypted backup an explicit parameter
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java index 3660ea432..48ea4196b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java @@ -29,14 +29,16 @@ import org.sufficientlysecure.keychain.util.Passphrase; public class BackupKeyringParcel implements Parcelable { public Uri mCanonicalizedPublicKeyringUri; - public boolean mExportSecret; - public long mMasterKeyIds[]; - public Uri mOutputUri; + public final boolean mExportSecret; + public final boolean mIsEncrypted; + public final long mMasterKeyIds[]; + public final Uri mOutputUri; - public BackupKeyringParcel(long[] masterKeyIds, boolean exportSecret, Uri outputUri) { + public BackupKeyringParcel(long[] masterKeyIds, boolean exportSecret, boolean isEncrypted, Uri outputUri) { mMasterKeyIds = masterKeyIds; mExportSecret = exportSecret; mOutputUri = outputUri; + mIsEncrypted = isEncrypted; } protected BackupKeyringParcel(Parcel in) { @@ -44,6 +46,7 @@ public class BackupKeyringParcel implements Parcelable { mExportSecret = in.readByte() != 0x00; mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader()); mMasterKeyIds = in.createLongArray(); + mIsEncrypted = in.readInt() != 0; } @Override @@ -57,6 +60,7 @@ public class BackupKeyringParcel implements Parcelable { dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00)); dest.writeValue(mOutputUri); dest.writeLongArray(mMasterKeyIds); + dest.writeInt(mIsEncrypted ? 1 : 0); } public static final Parcelable.Creator<BackupKeyringParcel> CREATOR = new Parcelable.Creator<BackupKeyringParcel>() { |