From f7959d2f7ec0b6a93637033a6cdf7a4ebf71ecf6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 9 Jul 2018 21:51:47 +0200
Subject: try to fix race condition with empty trust ui

---
 src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger')

diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index 06fab28c4..719ff1d34 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -331,9 +331,13 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
                 processFingerprintVerification(this.mPendingFingerprintVerificationUri);
                 this.mPendingFingerprintVerificationUri = null;
             } else {
-                reloadFingerprints();
-                populateView();
-                invalidateOptionsMenu();
+                final boolean keysToTrust = reloadFingerprints();
+                if (keysToTrust || hasPendingKeyFetches() || hasNoOtherTrustedKeys()) {
+                    populateView();
+                    invalidateOptionsMenu();
+                } else {
+                    finishOk(false);
+                }
             }
         }
     }
-- 
cgit v1.2.3