From b84fecf51abd0f6e02d49307827622b5aa6f4044 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Tue, 25 Aug 2015 12:17:09 +0200
Subject: Pass through device IDs when updating own list

---
 .../crypto/axolotl/AxolotlService.java             | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 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 21b49b10..816264ea 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -257,6 +257,8 @@ public class AxolotlService {
 		if (jid.toBareJid().equals(account.getJid().toBareJid())) {
 			if (deviceIds.contains(getOwnDeviceId())) {
 				deviceIds.remove(getOwnDeviceId());
+			} else {
+				publishOwnDeviceId(deviceIds);
 			}
 			for (Integer deviceId : deviceIds) {
 				AxolotlAddress ownDeviceAddress = new AxolotlAddress(jid.toBareJid().toString(), deviceId);
@@ -282,9 +284,6 @@ public class AxolotlService {
 				XmppAxolotlSession.Trust.UNTRUSTED);
 		this.deviceIds.put(jid, deviceIds);
 		mXmppConnectionService.keyStatusUpdated();
-		if (account.getJid().toBareJid().equals(jid.toBareJid())) {
-			publishOwnDeviceIdIfNeeded();
-		}
 	}
 
 	public void wipeOtherPepDevices() {
@@ -312,21 +311,8 @@ public class AxolotlService {
 				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					Element item = mXmppConnectionService.getIqParser().getItem(packet);
 					Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
-					if (deviceIds == null) {
-						deviceIds = new HashSet<Integer>();
-					}
 					if (!deviceIds.contains(getOwnDeviceId())) {
-						deviceIds.add(getOwnDeviceId());
-						IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(deviceIds);
-						Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Own device " + getOwnDeviceId() + " not in PEP devicelist. Publishing: " + publish);
-						mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
-							@Override
-							public void onIqPacketReceived(Account account, IqPacket packet) {
-								if (packet.getType() != IqPacket.TYPE.RESULT) {
-									Log.d(Config.LOGTAG, getLogprefix(account)+ "Error received while publishing own device id"  + packet.findChild("error"));
-								}
-							}
-						});
+						publishOwnDeviceId(deviceIds);
 					}
 				} else {
 					Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while retrieving Device Ids" + packet.findChild("error"));
@@ -335,6 +321,20 @@ public class AxolotlService {
 		});
 	}
 
+	public void publishOwnDeviceId(Set<Integer> deviceIds) {
+		deviceIds.add(getOwnDeviceId());
+		IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(deviceIds);
+		Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Own device " + getOwnDeviceId() + " not in PEP devicelist. Publishing: " + publish);
+		mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				if (packet.getType() != IqPacket.TYPE.RESULT) {
+					Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing own device id" + packet.findChild("error"));
+				}
+			}
+		});
+	}
+
 	public void publishBundlesIfNeeded() {
 		IqPacket packet = mXmppConnectionService.getIqGenerator().retrieveBundlesForDevice(account.getJid().toBareJid(), getOwnDeviceId());
 		mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
-- 
cgit v1.2.3