aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 19:46:44 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 19:46:44 +0200
commitf46f2b6895ac0c9c5c000e93457cb66049269ed0 (patch)
treebd7d772e29fc220ee3c11a2c8aae5df30d387f47 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
parentc3b12bb3c271a62c99e9417558576c202e6fed59 (diff)
downloadopen-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.tar.gz
open-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.tar.bz2
open-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.zip
Fixes and temporary fixes for returning results
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index 91939739a..1ca06e6b6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -442,7 +442,9 @@ public class OperationResultParcel implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mResult);
- dest.writeTypedList(mLog.toList());
+ if (mLog != null) {
+ dest.writeTypedList(mLog.toList());
+ }
}
public static final Creator<OperationResultParcel> CREATOR = new Creator<OperationResultParcel>() {