try to fix race condition with empty trust ui

1 files changed, 7 insertions, 3 deletions

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);
+                }
             }
         }
     }