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

let hasPendingFetches() return true when fetching device ids

Browse source
This commit is contained in:
Daniel Gultsch 2017-06-29 20:04:38 +02:00
parent 7a2856ac86
commit 8d6b2074cb
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View file

@ -1138,12 +1138,14 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
if (fetchStatusMap.getAll(ownAddress.getName()).containsValue(FetchStatus.PENDING)) { if (fetchStatusMap.getAll(ownAddress.getName()).containsValue(FetchStatus.PENDING)) {
return true; return true;
} }
synchronized (this.fetchDeviceIdsMap) {
for (Jid jid : jids) { for (Jid jid : jids) {
SignalProtocolAddress foreignAddress = new SignalProtocolAddress(jid.toBareJid().toPreppedString(), 0); SignalProtocolAddress foreignAddress = new SignalProtocolAddress(jid.toBareJid().toPreppedString(), 0);
if (fetchStatusMap.getAll(foreignAddress.getName()).containsValue(FetchStatus.PENDING)) { if (fetchStatusMap.getAll(foreignAddress.getName()).containsValue(FetchStatus.PENDING) || this.fetchDeviceIdsMap.containsKey(jid)) {
return true; return true;
} }
} }
}
return false; return false;
} }