1 files changed, 22 insertions, 24 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
index 5ab0faa6..87238f9e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
@@ -5,11 +5,15 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket;
 
 public abstract class AbstractParser {
 
@@ -28,24 +32,23 @@ public abstract class AbstractParser {
      *  attribute or the current time is less than the value of the 'stamp'
      *  attribute the current time is returned.
      */
-	protected long getTimestamp(Element packet) {
-		long now = System.currentTimeMillis();
-		Element delay = packet.findChild("delay");
-		if (delay == null) {
-			return now;
-		}
-		String stamp = delay.getAttribute("stamp");
-		if (stamp == null) {
-			return now;
+	public static Long getTimestamp(Element element, Long defaultValue) {
+		Element delay = element.findChild("delay","urn:xmpp:delay");
+		if (delay != null) {
+			String stamp = delay.getAttribute("stamp");
+			if (stamp != null) {
+				try {
+					return AbstractParser.parseTimestamp(delay.getAttribute("stamp")).getTime();
+				} catch (ParseException e) {
+					return defaultValue;
+				}
+			}
 		}
-        /*long time = parseTimestamp(stamp).getTime();
-        return now < time ? now : time;*/
-        try {
-            long time = parseTimestamp(stamp).getTime();
-            return now < time ? now : time;
-        } catch (ParseException e) {
-            return now;
-        }
+		return defaultValue;
+	}
+
+	protected long getTimestamp(Element packet) {
+		return getTimestamp(packet,System.currentTimeMillis());
 	}
 
     /**
@@ -77,8 +80,7 @@ public abstract class AbstractParser {
         updateLastseen(packet, account, from, presenceOverwrite);
     }
 
-    protected void updateLastseen(final Element packet, final Account account, final Jid from,
-                                  final boolean presenceOverwrite) {
+	protected void updateLastseen(final Element packet, final Account account, final Jid from, final boolean presenceOverwrite) {
 		final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
 		final Contact contact = account.getRoster().getContact(from);
 		final long timestamp = getTimestamp(packet);
@@ -95,10 +97,6 @@ public abstract class AbstractParser {
 		if (item == null) {
 			return null;
 		}
-		Element data = item.findChild("data", "urn:xmpp:avatar:data");
-		if (data == null) {
-			return null;
-		}
-		return data.getContent();
+		return item.findChildContent("data", "urn:xmpp:avatar:data");
 	}
 }