fix crash in ViewKeyActivity

2018-07-18 11:05:09 +02:00
parent 59b6d0b1ca
commit 54498ef4c4
1 changed files with 1 additions and 1 deletions
--- 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;