From 328c6dea0fb730aa7b01cca91cd8adec5cae15f5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 7 Dec 2017 14:47:21 +0100
Subject: [PATCH] fixed workaround that allowed us to expire devices

---
 .../crypto/axolotl/AxolotlService.java            | 15 ++++++++-------
 .../siacs/conversations/parser/MessageParser.java |  3 +--
 2 files changed, 9 insertions(+), 9 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 4acd46702..f449b4294 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -80,8 +80,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 	private final SerialSingleThreadExecutor executor;
 	private int numPublishTriesOnEmptyPep = 0;
 	private boolean pepBroken = false;
+	private int lastDeviceListNotificationHash = 0;
 
-	private AtomicBoolean ownPushPending = new AtomicBoolean(false);
 	private AtomicBoolean changeAccessMode = new AtomicBoolean(false);
 
 	@Override
@@ -350,7 +350,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 
 	public void resetBrokenness() {
 		this.pepBroken = false;
-		numPublishTriesOnEmptyPep = 0;
+		this.numPublishTriesOnEmptyPep = 0;
+		this.lastDeviceListNotificationHash = 0;
 	}
 
 	public void clearErrorsInFetchStatusMap(Jid jid) {
@@ -388,11 +389,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 	}
 
 	public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
-		boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
-		if (me && ownPushPending.getAndSet(false)) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring own device update because of pending push");
+		final int hash = deviceIds.hashCode();
+		final boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
+		if (me && hash == this.lastDeviceListNotificationHash) {
+			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring duplicate own device id list");
 			return;
 		}
+		this.lastDeviceListNotificationHash = hash;
 		boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
 		if (me) {
 			deviceIds.remove(getOwnDeviceId());
@@ -527,7 +530,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 	private void publishDeviceIdsAndRefineAccessModel(final Set<Integer> ids, final boolean firstAttempt) {
 		final Bundle publishOptions = account.getXmppConnection().getFeatures().pepPublishOptions() ? PublishOptions.openAccess() : null;
 		IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(ids, publishOptions);
-		ownPushPending.set(true);
 		mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
@@ -551,7 +553,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 						account.setOption(Account.OPTION_REQUIRES_ACCESS_MODE_CHANGE,false);
 						mXmppConnectionService.databaseBackend.updateAccount(account);
 					}
-					ownPushPending.set(false);
 					if (packet.getType() == IqPacket.TYPE.ERROR) {
 						pepBroken = true;
 						Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing own device id" + packet.findChild("error"));
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 66ec66124..77e435e9a 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -293,10 +293,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 				mXmppConnectionService.updateAccountUi();
 			}
 		} else if (AxolotlService.PEP_DEVICE_LIST.equals(node)) {
-
 			Element item = items.findChild("item");
 			Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
-			Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Received PEP device list (" + deviceIds + ") update from " + from + ", processing...");
+			Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Received PEP device list " + deviceIds + " update from " + from + ", processing... ");
 			AxolotlService axolotlService = account.getAxolotlService();
 			axolotlService.registerDevices(from, deviceIds);
 			mXmppConnectionService.updateAccountUi();