Merge branch 'master' of github.com:open-keychain/open-keychain

3 files changed, 9 insertions, 4 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>() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index d457e75bd..6df84a056 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -183,7 +183,7 @@ public class SubkeysAdapter extends CursorAdapter {
 
             SaveKeyringParcel.SubkeyChange subkeyChange = mSaveKeyringParcel.getSubkeyChange(keyId);
             if (subkeyChange != null) {
-                if (subkeyChange.mExpiry == null) {
+                if (subkeyChange.mExpiry == null || subkeyChange.mExpiry == 0L) {
                     expiryDate = null;
                 } else {
                     expiryDate = new Date(subkeyChange.mExpiry * 1000);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
index aa63f9944..276ad15fc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
@@ -141,7 +141,7 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
                 dismiss();
 
                 Bundle data = new Bundle();
-                data.putSerializable(MESSAGE_DATA_EXPIRY_DATE, null);
+                data.putSerializable(MESSAGE_DATA_EXPIRY_DATE, 0L);
                 sendMessageToHandler(MESSAGE_NEW_EXPIRY_DATE, data);
             }
         });