fix keys with no expiry in ui code

1 files changed, 7 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index d58392d77..1c83873be 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -205,13 +205,18 @@ public abstract class OperationResults {
 
         public EditKeyResult(Parcel source) {
             super(source);
-            mRingMasterKeyId = source.readLong();
+            mRingMasterKeyId = source.readInt() != 0 ? source.readLong() : null;
         }
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
             super.writeToParcel(dest, flags);
-            dest.writeLong(mRingMasterKeyId);
+            if (mRingMasterKeyId == null) {
+                dest.writeInt(0);
+            } else {
+                dest.writeInt(1);
+                dest.writeLong(mRingMasterKeyId);
+            }
         }
 
         public static Creator<EditKeyResult> CREATOR = new Creator<EditKeyResult>() {