Change summary
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java | 10 ++-
1 file changed, 7 insertions(+), 3 deletions(-)
Detailed changes
@@ -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);
+ }
}
}
}