From 606f43f50904f7d811cf9b438e0e820e586be900 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 27 Jun 2016 13:16:43 +0300
Subject: spring-jdbc near complete

---
 .../java/com/juick/xmpp/extensions/JuickMessage.java    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/juick/xmpp/extensions/JuickMessage.java')

diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index 53dd6deb..220caba7 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -20,6 +20,10 @@ package com.juick.xmpp.extensions;
 import com.juick.xmpp.utils.XmlUtils;
 import com.juick.xmpp.*;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -31,12 +35,17 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
 
     public final static String XMLNS = "http://juick.com/message";
     public final static String TagName = "juick";
+    private SimpleDateFormat df;
 
     public JuickMessage() {
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     public JuickMessage(com.juick.Message msg) {
         super(msg);
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     @Override
@@ -45,7 +54,7 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
     }
 
     @Override
-    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException {
+    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
         JuickMessage jmsg = new JuickMessage();
 
         final String sMID = parser.getAttributeValue(null, "mid");
@@ -72,7 +81,7 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
         if (sReadOnly != null) {
             jmsg.ReadOnly = true;
         }
-        jmsg.TimestampString = parser.getAttributeValue(null, "ts");
+        jmsg.setDate(df.parse(parser.getAttributeValue(null, "ts")));
         jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
 
         while (parser.next() == XmlPullParser.START_TAG) {
@@ -112,8 +121,8 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
         if (ReadOnly) {
             ret += " readonly=\"1\"";
         }
-        if (TimestampString != null) {
-            ret += " ts=\"" + TimestampString + "\"";
+        if (getDate() != null) {
+            ret += " ts=\"" + df.format(getDate()) + "\"";
         }
         if (AttachmentType != null) {
             ret += " attach=\"" + AttachmentType + "\"";
-- 
cgit v1.2.3


From 857a930d31c425185c9b9405f5a7820e6cec9491 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 7 Jul 2016 10:55:54 +0300
Subject: fix ts parsing

---
 src/main/java/com/juick/xmpp/extensions/JuickMessage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/juick/xmpp/extensions/JuickMessage.java')

diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index 220caba7..885b2375 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -81,7 +81,10 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
         if (sReadOnly != null) {
             jmsg.ReadOnly = true;
         }
-        jmsg.setDate(df.parse(parser.getAttributeValue(null, "ts")));
+        String ts = parser.getAttributeValue(null, "timestamp");
+        if (ts != null) {
+            jmsg.setDate(df.parse(ts));
+        }
         jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
 
         while (parser.next() == XmlPullParser.START_TAG) {
-- 
cgit v1.2.3