aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-07-09 21:51:47 +0200
committerChristian Schneppe <christian@pix-art.de>2018-07-09 21:51:47 +0200
commitf7959d2f7ec0b6a93637033a6cdf7a4ebf71ecf6 (patch)
tree706f85f379fefdfb35270f14e016f95a487ba4d6 /src/main/java/de
parentc76ca96b3da3f0456ef7262aa8ab1defa8dd14f0 (diff)
try to fix race condition with empty trust ui
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java10
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);
+ }
}
}
}