answer correctly if both markers and receipts are requested

2 files changed, 17 insertions, 13 deletions

diff --git a/src/eu/siacs/conversations/generator/MessageGenerator.java b/src/eu/siacs/conversations/generator/MessageGenerator.java
index 4885177c..4449a7ec 100644
--- a/src/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/eu/siacs/conversations/generator/MessageGenerator.java
@@ -151,4 +151,14 @@ public class MessageGenerator {
 		packet.addChild(x);
 		return packet;
 	}
+	
+	public MessagePacket received(Account account, MessagePacket originalMessage, String namespace) {
+		MessagePacket receivedPacket = new MessagePacket();
+		receivedPacket.setType(MessagePacket.TYPE_NORMAL);
+		receivedPacket.setTo(originalMessage.getFrom());
+		receivedPacket.setFrom(account.getFullJid());
+		Element received = receivedPacket.addChild("received",namespace);
+		received.setAttribute("id", originalMessage.getId());
+		return receivedPacket;
+	}
 }
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index f6cd47ee..a4fcc810 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -316,26 +316,20 @@ public class MessageParser extends AbstractParser implements
 			return;
 		} else if (packet.getType() == MessagePacket.TYPE_NORMAL) {
 			this.parseNormal(packet, account);
+			return;
 		}
 		if ((message == null) || (message.getBody() == null)) {
 			return;
 		}
 		if ((mXmppConnectionService.confirmMessages())
 				&& ((packet.getId() != null))) {
-			MessagePacket receivedPacket = new MessagePacket();
-			receivedPacket.setType(MessagePacket.TYPE_NORMAL);
-			receivedPacket.setTo(message.getCounterpart());
-			receivedPacket.setFrom(account.getFullJid());
 			if (packet.hasChild("markable", "urn:xmpp:chat-markers:0")) {
-				Element received = receivedPacket.addChild("received",
-						"urn:xmpp:chat-markers:0");
-				received.setAttribute("id", packet.getId());
-				account.getXmppConnection().sendMessagePacket(receivedPacket);
-			} else if (packet.hasChild("request", "urn:xmpp:receipts")) {
-				Element received = receivedPacket.addChild("received",
-						"urn:xmpp:receipts");
-				received.setAttribute("id", packet.getId());
-				account.getXmppConnection().sendMessagePacket(receivedPacket);
+				MessagePacket receipt = mXmppConnectionService.getMessageGenerator().received(account, packet, "urn:xmpp:chat-markers:0");
+				mXmppConnectionService.sendMessagePacket(account, receipt);
+			}
+			if (packet.hasChild("request", "urn:xmpp:receipts")) {
+				MessagePacket receipt = mXmppConnectionService.getMessageGenerator().received(account, packet, "urn:xmpp:receipts");
+				mXmppConnectionService.sendMessagePacket(account, receipt);
 			}
 		}
 		Conversation conversation = message.getConversation();