From 9408dd597a0d68fa0ed39bf133a0b3c518dcd8a2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 30 Jun 2018 13:35:05 +0200
Subject: [PATCH] try to fix race condition with empty trust ui

---
 .../eu/siacs/conversations/ui/TrustKeysActivity.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index d33b867f9..22896f6be 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
@@ -333,9 +333,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);
+				}
 			}
 		}
 	}