From 1156ccbce2f9fa5a7b86a4caec8591ef8e2e6633 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 26 Aug 2015 20:51:18 +0200
Subject: [PATCH] Fix error handling for announce check retrieval

Only aborts when a timeout was received. Error conditions (most notably
item-not-found) are interpreted as no other devices existing.
---
 .../siacs/conversations/crypto/axolotl/AxolotlService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 17d911b44..2ce62c9ad 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -323,14 +323,14 @@ public class AxolotlService {
 		mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
+				if (packet.getType() == IqPacket.TYPE.TIMEOUT) {
+					Log.d(Config.LOGTAG, getLogprefix(account) + "Timeout received while retrieving own Device Ids.");
+				} else {
 					Element item = mXmppConnectionService.getIqParser().getItem(packet);
 					Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
 					if (!deviceIds.contains(getOwnDeviceId())) {
 						publishOwnDeviceId(deviceIds);
 					}
-				} else {
-					Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while retrieving Device Ids" + packet.findChild("error"));
 				}
 			}
 		});