aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-25 11:43:10 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-25 11:43:10 +0200
commit5eae1e52d264ac78f5e902fc647009cde5337946 (patch)
tree1524a34810582d00e8073e5dccfb4044a61728c9 /src/main
parent25c49d5e34a842ddbe0a7430c87ea46065468245 (diff)
cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java10
1 files changed, 7 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 d700b644..21b49b10 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -282,7 +282,9 @@ public class AxolotlService {
XmppAxolotlSession.Trust.UNTRUSTED);
this.deviceIds.put(jid, deviceIds);
mXmppConnectionService.keyStatusUpdated();
- publishOwnDeviceIdIfNeeded();
+ if (account.getJid().toBareJid().equals(jid.toBareJid())) {
+ publishOwnDeviceIdIfNeeded();
+ }
}
public void wipeOtherPepDevices() {
@@ -320,12 +322,14 @@ public class AxolotlService {
mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
- // TODO: implement this!
+ if (packet.getType() != IqPacket.TYPE.RESULT) {
+ Log.d(Config.LOGTAG, getLogprefix(account)+ "Error received while publishing own device id" + packet.findChild("error"));
+ }
}
});
}
} else {
- Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing device ID:" + packet.findChild("error"));
+ Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while retrieving Device Ids" + packet.findChild("error"));
}
}
});