From e32f380dae4913d8152fc92b76193de241089cf8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 14 May 2015 14:42:21 +0200
Subject: provide helper function for getting the content of a child directly

---
 .../eu/siacs/conversations/xmpp/pep/Avatar.java    |  3 +--
 .../conversations/xmpp/stanzas/MessagePacket.java  | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/xmpp')

diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
index 04d55bbe5..74da6a9bd 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
@@ -83,8 +83,7 @@ public class Avatar {
 	}
 
 	public static Avatar parsePresence(Element x) {
-		Element photo = x != null ? x.findChild("photo") : null;
-		String hash = photo != null ? photo.getContent() : null;
+		String hash = x == null ? null : x.findChildContent("photo");
 		if (hash == null) {
 			return null;
 		}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
index 93aaa68cf..11c3452b0 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
@@ -66,4 +66,27 @@ public class MessagePacket extends AbstractStanza {
 			return TYPE_NORMAL;
 		}
 	}
+
+	public MessagePacket getForwardedMessagePacket(String name, String namespace) {
+		Element wrapper = findChild(name, namespace);
+		if (wrapper == null) {
+			return null;
+		}
+		Element forwarded = wrapper.findChild("forwarded","urn:xmpp:forward:0");
+		if (forwarded == null) {
+			return null;
+		}
+		return MessagePacket.create(forwarded.findChild("message"));
+	}
+
+
+	public static MessagePacket create(Element element) {
+		if (element == null) {
+			return null;
+		}
+		MessagePacket packet = new MessagePacket();
+		packet.setAttributes(element.getAttributes());
+		packet.setChildren(element.getChildren());
+		return packet;
+	}
 }
-- 
cgit v1.2.3