From 6e67c149496f530dd732689770c3e2a62337a14a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 12 Jun 2018 13:39:00 +0200
Subject: [PATCH] correctly parcel SaveKeyringParcel

---
 .../keychain/operations/results/SaveKeyringResult.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SaveKeyringResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SaveKeyringResult.java
index 8b41a52f0..7e14bd4de 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SaveKeyringResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/SaveKeyringResult.java
@@ -46,13 +46,18 @@ public class SaveKeyringResult extends OperationResult {
 
     public SaveKeyringResult(Parcel source) {
         super(source);
-        savedMasterKeyId = source.readLong();
+        savedMasterKeyId = source.readInt() != 0 ? source.readLong() : null;
     }
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
-        dest.writeLong(savedMasterKeyId);
+        if (savedMasterKeyId != null) {
+            dest.writeInt(1);
+            dest.writeLong(savedMasterKeyId);
+        } else {
+            dest.writeInt(0);
+        }
     }
 
     public static Creator<SaveKeyringResult> CREATOR = new Creator<SaveKeyringResult>() {