From 7b3d871f28787c4e91dead1a53994f8f07734a87 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 3 May 2018 22:44:28 +0200
Subject: [PATCH] improved logging for node configuration change

---
 .../crypto/axolotl/AxolotlService.java              | 13 +++++++++----
 .../conversations/generator/MessageGenerator.java   |  2 +-
 .../services/XmppConnectionService.java             |  1 +
 3 files changed, 11 insertions(+), 5 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 d92bf736a..9005025e9 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -597,7 +597,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 					}
 					if (packet.getType() == IqPacket.TYPE.ERROR) {
 						if (preConditionNotMet) {
-							Log.d(Config.LOGTAG,account.getJid().asBareJid()+": pre condition still not met on second attempt");
+							Log.d(Config.LOGTAG,account.getJid().asBareJid()+": device list pre condition still not met on second attempt");
 						} else if (error != null) {
 							pepBroken = true;
 							Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing own device id" + packet.findChild("error"));
@@ -791,8 +791,9 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 		mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(final Account account, IqPacket packet) {
-				Element error = packet.getType() == IqPacket.TYPE.ERROR ? packet.findChild("error") : null;
-				if (firstAttempt && error != null && error.hasChild("precondition-not-met", Namespace.PUBSUB_ERROR)) {
+				final Element error = packet.getType() == IqPacket.TYPE.ERROR ? packet.findChild("error") : null;
+				final boolean preconditionNotMet = error != null && error.hasChild("precondition-not-met", Namespace.PUBSUB_ERROR);
+				if (firstAttempt && preconditionNotMet) {
 					Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": precondition wasn't met for bundle. pushing node configuration");
 					final String node = AxolotlService.PEP_BUNDLES + ":" + getOwnDeviceId();
 					mXmppConnectionService.pushNodeConfiguration(account, node, publishOptions, new XmppConnectionService.OnConfigurationPushed() {
@@ -815,8 +816,12 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 						publishOwnDeviceIdIfNeeded();
 					}
 				} else if (packet.getType() == IqPacket.TYPE.ERROR) {
+					if (preconditionNotMet) {
+						Log.d(Config.LOGTAG,getLogprefix(account) + "bundle precondition still not met after second attempt");
+					} else {
+						Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing bundle: " + error);
+					}
 					pepBroken = true;
-					Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing bundle: " + packet.findChild("error"));
 				}
 			}
 		});
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 7022ba9e8..f1d6837d5 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -39,7 +39,7 @@ public class MessageGenerator extends AbstractGenerator {
 			if (this.mXmppConnectionService.indicateReceived() && !isWithSelf) {
 				packet.addChild("request", "urn:xmpp:receipts");
 			}
-		} else if (message.getType() == Message.TYPE_PRIVATE) {
+		} else if (message.getType() == Message.TYPE_PRIVATE) { //TODO files and images might be private as well
 			packet.setTo(message.getCounterpart());
 			packet.setType(MessagePacket.TYPE_CHAT);
 			packet.addChild("x","http://jabber.org/protocol/muc#user");
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 029cae46f..13e9ed193 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2483,6 +2483,7 @@ public class XmppConnectionService extends Service {
 							@Override
 							public void onIqPacketReceived(Account account, IqPacket packet) {
 								if (packet.getType() == IqPacket.TYPE.RESULT && callback != null) {
+									Log.d(Config.LOGTAG,account.getJid().asBareJid()+": successfully changed node configuration for node "+node);
 									callback.onPushSucceeded();
 								} else if (packet.getType() == IqPacket.TYPE.ERROR && callback != null) {
 									callback.onPushFailed();