From 54498ef4c469738551f47385765b5e1ab806070f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 18 Jul 2018 11:05:09 +0200
Subject: [PATCH] fix crash in ViewKeyActivity

---
 .../keychain/ui/keyview/UnifiedKeyInfoViewModel.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/UnifiedKeyInfoViewModel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/UnifiedKeyInfoViewModel.java
index 69472c8ab..f121434fd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/UnifiedKeyInfoViewModel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/UnifiedKeyInfoViewModel.java
@@ -17,7 +17,7 @@ public class UnifiedKeyInfoViewModel extends ViewModel {
     private LiveData<UnifiedKeyInfo> unifiedKeyInfoLiveData;
 
     public void setMasterKeyId(long masterKeyId) {
-        if (this.masterKeyId != null) {
+        if (this.masterKeyId != null && this.masterKeyId != masterKeyId) {
             throw new IllegalStateException("cannot change masterKeyId once set!");
         }
         this.masterKeyId = masterKeyId;