aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-16 00:36:27 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-03-01 00:22:19 +0100
commita2dcb579ff5d3565e7e6c6afe37878855361595b (patch)
tree6cc96edef8783154ba1c1eab90c20b693f7b1e72 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent067d5fd0b0b9d1889f3052b05b680168f29825b6 (diff)
downloadopen-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.tar.gz
open-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.tar.bz2
open-keychain-a2dcb579ff5d3565e7e6c6afe37878855361595b.zip
Add backup API
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java7
1 files changed, 1 insertions, 6 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 3d9626934..3660ea432 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java
@@ -28,15 +28,12 @@ import org.sufficientlysecure.keychain.util.Passphrase;
public class BackupKeyringParcel implements Parcelable {
public Uri mCanonicalizedPublicKeyringUri;
- public Passphrase mSymmetricPassphrase;
public boolean mExportSecret;
public long mMasterKeyIds[];
public Uri mOutputUri;
- public BackupKeyringParcel(Passphrase symmetricPassphrase,
- long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
- mSymmetricPassphrase = symmetricPassphrase;
+ public BackupKeyringParcel(long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
mMasterKeyIds = masterKeyIds;
mExportSecret = exportSecret;
mOutputUri = outputUri;
@@ -47,7 +44,6 @@ public class BackupKeyringParcel implements Parcelable {
mExportSecret = in.readByte() != 0x00;
mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader());
mMasterKeyIds = in.createLongArray();
- mSymmetricPassphrase = in.readParcelable(getClass().getClassLoader());
}
@Override
@@ -61,7 +57,6 @@ public class BackupKeyringParcel implements Parcelable {
dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00));
dest.writeValue(mOutputUri);
dest.writeLongArray(mMasterKeyIds);
- dest.writeParcelable(mSymmetricPassphrase, 0);
}
public static final Parcelable.Creator<BackupKeyringParcel> CREATOR = new Parcelable.Creator<BackupKeyringParcel>() {