diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 00:05:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 00:05:21 +0200 |
commit | 99fd1f4c22c51fe4967517c5cf69dc3af9fe5378 (patch) | |
tree | 53984b08cecae801d2d2939ec0dc02d1b015f4e8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results | |
parent | 326834fd581861e0f8056eb0a5de8205088e7f09 (diff) | |
download | open-keychain-99fd1f4c22c51fe4967517c5cf69dc3af9fe5378.tar.gz open-keychain-99fd1f4c22c51fe4967517c5cf69dc3af9fe5378.tar.bz2 open-keychain-99fd1f4c22c51fe4967517c5cf69dc3af9fe5378.zip |
preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/InputDataResult.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/InputDataResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/InputDataResult.java index 908636ca7..e3432e637 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/InputDataResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/InputDataResult.java @@ -25,21 +25,30 @@ import java.util.ArrayList; public class InputDataResult extends InputPendingResult { public final ArrayList<Uri> mOutputUris; - public DecryptVerifyResult mDecryptVerifyResult; + final public DecryptVerifyResult mDecryptVerifyResult; public InputDataResult(OperationLog log, InputPendingResult result) { super(log, result); mOutputUris = null; + mDecryptVerifyResult = null; } - public InputDataResult(int result, OperationLog log, ArrayList<Uri> temporaryUris) { + public InputDataResult(int result, OperationLog log, DecryptVerifyResult decryptResult, ArrayList<Uri> temporaryUris) { super(result, log); mOutputUris = temporaryUris; + mDecryptVerifyResult = decryptResult; + } + + public InputDataResult(int result, OperationLog log) { + super(result, log); + mOutputUris = null; + mDecryptVerifyResult = null; } protected InputDataResult(Parcel in) { super(in); mOutputUris = in.createTypedArrayList(Uri.CREATOR); + mDecryptVerifyResult = in.readParcelable(DecryptVerifyResult.class.getClassLoader()); } public ArrayList<Uri> getOutputUris() { @@ -55,6 +64,7 @@ public class InputDataResult extends InputPendingResult { public void writeToParcel(Parcel dest, int flags) { super.writeToParcel(dest, flags); dest.writeTypedList(mOutputUris); + dest.writeParcelable(mDecryptVerifyResult, 0); } public static final Creator<InputDataResult> CREATOR = new Creator<InputDataResult>() { |