From 53680b621320512b44e961f0453043a31c40dfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 15 Oct 2015 21:48:01 +0200 Subject: Cleanup, fix advanced sharing --- .../keychain/service/BackupKeyringParcel.java | 78 +++++++++++++++++++++ .../keychain/service/ExportKeyringParcel.java | 79 ---------------------- .../keychain/service/KeychainService.java | 6 +- 3 files changed, 81 insertions(+), 82 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java new file mode 100644 index 000000000..3d9626934 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2015 Dominik Schürmann + * Copyright (C) 2015 Vincent Breitmoser + * Copyright (C) 2015 Adithya Abraham Philip + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.service; + +import android.net.Uri; +import android.os.Parcel; +import android.os.Parcelable; + +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; + mMasterKeyIds = masterKeyIds; + mExportSecret = exportSecret; + mOutputUri = outputUri; + } + + protected BackupKeyringParcel(Parcel in) { + mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader()); + mExportSecret = in.readByte() != 0x00; + mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader()); + mMasterKeyIds = in.createLongArray(); + mSymmetricPassphrase = in.readParcelable(getClass().getClassLoader()); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeValue(mCanonicalizedPublicKeyringUri); + dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00)); + dest.writeValue(mOutputUri); + dest.writeLongArray(mMasterKeyIds); + dest.writeParcelable(mSymmetricPassphrase, 0); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override + public BackupKeyringParcel createFromParcel(Parcel in) { + return new BackupKeyringParcel(in); + } + + @Override + public BackupKeyringParcel[] newArray(int size) { + return new BackupKeyringParcel[size]; + } + }; +} \ No newline at end of file diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java deleted file mode 100644 index 9b0e5573e..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2015 Dominik Schürmann - * Copyright (C) 2015 Vincent Breitmoser - * Copyright (C) 2015 Adithya Abraham Philip - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.service; - -import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; - -import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; -import org.sufficientlysecure.keychain.util.Passphrase; - - -public class ExportKeyringParcel implements Parcelable { - public Uri mCanonicalizedPublicKeyringUri; - public Passphrase mSymmetricPassphrase; - - public boolean mExportSecret; - public long mMasterKeyIds[]; - public Uri mOutputUri; - - public ExportKeyringParcel(Passphrase symmetricPassphrase, - long[] masterKeyIds, boolean exportSecret, Uri outputUri) { - mSymmetricPassphrase = symmetricPassphrase; - mMasterKeyIds = masterKeyIds; - mExportSecret = exportSecret; - mOutputUri = outputUri; - } - - protected ExportKeyringParcel(Parcel in) { - mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader()); - mExportSecret = in.readByte() != 0x00; - mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader()); - mMasterKeyIds = in.createLongArray(); - mSymmetricPassphrase = in.readParcelable(getClass().getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeValue(mCanonicalizedPublicKeyringUri); - dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00)); - dest.writeValue(mOutputUri); - dest.writeLongArray(mMasterKeyIds); - dest.writeParcelable(mSymmetricPassphrase, 0); - } - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public ExportKeyringParcel createFromParcel(Parcel in) { - return new ExportKeyringParcel(in); - } - - @Override - public ExportKeyringParcel[] newArray(int size) { - return new ExportKeyringParcel[size]; - } - }; -} \ No newline at end of file diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java index 981a76203..ee953b060 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java @@ -33,7 +33,7 @@ import org.sufficientlysecure.keychain.operations.CertifyOperation; import org.sufficientlysecure.keychain.operations.ConsolidateOperation; import org.sufficientlysecure.keychain.operations.DeleteOperation; import org.sufficientlysecure.keychain.operations.EditKeyOperation; -import org.sufficientlysecure.keychain.operations.ExportOperation; +import org.sufficientlysecure.keychain.operations.BackupOperation; import org.sufficientlysecure.keychain.operations.ImportOperation; import org.sufficientlysecure.keychain.operations.KeybaseVerificationOperation; import org.sufficientlysecure.keychain.operations.InputDataOperation; @@ -125,8 +125,8 @@ public class KeychainService extends Service implements Progressable { op = new PromoteKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof ImportKeyringParcel) { op = new ImportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); - } else if (inputParcel instanceof ExportKeyringParcel) { - op = new ExportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); + } else if (inputParcel instanceof BackupKeyringParcel) { + op = new BackupOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof UploadKeyringParcel) { op = new UploadOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled); } else if (inputParcel instanceof ConsolidateInputParcel) { -- cgit v1.2.3