From dbda2afd6db9206284d6153960b836de088f0e20 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 18 Dec 2016 11:47:42 +0100 Subject: [PATCH] remove broken devices only once to prevent loops --- .../siacs/conversations/crypto/axolotl/AxolotlService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java index 6bd10c15a..020b76a37 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java @@ -785,6 +785,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { } } + private final Set PREVIOUSLY_REMOVED_FROM_ANNOUNCEMENT = new HashSet<>(); + private void finishBuildingSessionsFromPEP(final AxolotlAddress address) { AxolotlAddress ownAddress = new AxolotlAddress(account.getJid().toBareJid().toPreppedString(), 0); Map own = fetchStatusMap.getAll(ownAddress); @@ -805,9 +807,10 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { Set ownDeviceIds = new HashSet<>(getOwnDeviceIds()); boolean publish = false; for(Map.Entry 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; - 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) {