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

remove broken devices only once to prevent loops

Browse source
This commit is contained in:
Daniel Gultsch 2016-12-18 11:47:42 +01:00
parent 87746ca2ba
commit dbda2afd6d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -785,6 +785,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
} }
} }
private final Set<Integer> PREVIOUSLY_REMOVED_FROM_ANNOUNCEMENT = new HashSet<>();
private void finishBuildingSessionsFromPEP(final AxolotlAddress address) { private void finishBuildingSessionsFromPEP(final AxolotlAddress address) {
AxolotlAddress ownAddress = new AxolotlAddress(account.getJid().toBareJid().toPreppedString(), 0); AxolotlAddress ownAddress = new AxolotlAddress(account.getJid().toBareJid().toPreppedString(), 0);
Map<Integer, FetchStatus> own = fetchStatusMap.getAll(ownAddress); Map<Integer, FetchStatus> own = fetchStatusMap.getAll(ownAddress);
@ -805,9 +807,10 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
Set<Integer> ownDeviceIds = new HashSet<>(getOwnDeviceIds()); Set<Integer> ownDeviceIds = new HashSet<>(getOwnDeviceIds());
boolean publish = false; boolean publish = false;
for(Map.Entry<Integer,FetchStatus> entry : own.entrySet()) { for(Map.Entry<Integer,FetchStatus> entry : own.entrySet()) {
if (entry.getValue() == FetchStatus.ERROR && ownDeviceIds.remove(entry.getKey())) { int id = entry.getKey();
if (entry.getValue() == FetchStatus.ERROR && PREVIOUSLY_REMOVED_FROM_ANNOUNCEMENT.add(id) && ownDeviceIds.remove(id)) {
publish = true; publish = true;
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": error fetching own device with id "+entry.getKey()+". removing from annoucement"); Log.d(Config.LOGTAG,account.getJid().toBareJid()+": error fetching own device with id "+id+". removing from announcement");
} }
} }
if (publish) { if (publish) {