diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 03:20:39 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-26 03:21:53 +0200 |
commit | c93670f3c6af3bc27b531a2501fc82e9a759ddc0 (patch) | |
tree | 111963e2970f25f7231885e1c7ccc8b230cf629f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java | |
parent | 603eab729fcd76fb6c5324063affd4de9cbe8984 (diff) | |
download | open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.tar.gz open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.tar.bz2 open-keychain-c93670f3c6af3bc27b531a2501fc82e9a759ddc0.zip |
export: externalize upload into its own operation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java index f568d19af..0e990f24c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java @@ -32,30 +32,15 @@ public class ExportKeyringParcel implements Parcelable { public boolean mExportSecret; public long mMasterKeyIds[]; - public String mOutputFile; public Uri mOutputUri; - public ExportType mExportType; - - public enum ExportType { - UPLOAD_KEYSERVER, - EXPORT_URI - } - - public ExportKeyringParcel(String keyserver, Uri keyringUri) { - mExportType = ExportType.UPLOAD_KEYSERVER; - mKeyserver = keyserver; - mCanonicalizedPublicKeyringUri = keyringUri; - } public ExportKeyringParcel(String keyserver, UncachedKeyRing uncachedKeyRing) { - mExportType = ExportType.UPLOAD_KEYSERVER; mKeyserver = keyserver; mUncachedKeyRing = uncachedKeyRing; } @SuppressWarnings("unused") // TODO: is it used? public ExportKeyringParcel(long[] masterKeyIds, boolean exportSecret, Uri outputUri) { - mExportType = ExportType.EXPORT_URI; mMasterKeyIds = masterKeyIds; mExportSecret = exportSecret; mOutputUri = outputUri; @@ -66,9 +51,7 @@ public class ExportKeyringParcel implements Parcelable { mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader()); mUncachedKeyRing = (UncachedKeyRing) in.readValue(UncachedKeyRing.class.getClassLoader()); mExportSecret = in.readByte() != 0x00; - mOutputFile = in.readString(); mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader()); - mExportType = (ExportType) in.readValue(ExportType.class.getClassLoader()); mMasterKeyIds = in.createLongArray(); } @@ -83,9 +66,7 @@ public class ExportKeyringParcel implements Parcelable { dest.writeValue(mCanonicalizedPublicKeyringUri); dest.writeValue(mUncachedKeyRing); dest.writeByte((byte) (mExportSecret ? 0x01 : 0x00)); - dest.writeString(mOutputFile); dest.writeValue(mOutputUri); - dest.writeValue(mExportType); dest.writeLongArray(mMasterKeyIds); } |