narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

try to fix race condition with empty trust ui

Browse source
This commit is contained in:
Daniel Gultsch 2018-06-30 13:35:05 +02:00
parent 3218ca3fe3
commit 9408dd597a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
View file

@ -333,9 +333,13 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
processFingerprintVerification(this.mPendingFingerprintVerificationUri); processFingerprintVerification(this.mPendingFingerprintVerificationUri);
this.mPendingFingerprintVerificationUri = null; this.mPendingFingerprintVerificationUri = null;
} else { } else {
reloadFingerprints(); final boolean keysToTrust = reloadFingerprints();
if (keysToTrust || hasPendingKeyFetches() || hasNoOtherTrustedKeys()) {
populateView(); populateView();
invalidateOptionsMenu(); invalidateOptionsMenu();
} else {
finishOk(false);
}
} }
} }
} }