fix push queries and jabber serialization

2 files changed, 17 insertions, 12 deletions

diff --git a/src/main/java/com/juick/PushComponent.java b/src/main/java/com/juick/PushComponent.java
index 3a96ff16..b77d2937 100644
--- a/src/main/java/com/juick/PushComponent.java
+++ b/src/main/java/com/juick/PushComponent.java
@@ -78,7 +78,7 @@ public class PushComponent implements JuickComponent {
         if (jmsg == null) {
             return;
         }
-        logger.info("Message to push: " + msg.toString());
+        logger.info("Message to push: " + jmsg);
         List<User> subscribedUsers = new ArrayList<>();
         boolean isPM = jmsg.getMID() == 0;
         boolean isReply = jmsg.getRID() > 0;
@@ -101,16 +101,17 @@ public class PushComponent implements JuickComponent {
         }
 
         /*** ANDROID ***/
-        List<String> regids;
+        List<String> regids = new ArrayList<>();
         if (isPM) {
-            regids = new ArrayList<>();
             String targetId = PushQueries.getAndroidRegID(sql, pmTo);
             if (targetId != null && !targetId.isEmpty()) {
                 regids.add(targetId);
             }
         } else {
             List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
-            regids = PushQueries.getAndroidTokens(sql, uids);
+            if (uids.size() > 0) {
+                regids = PushQueries.getAndroidTokens(sql, uids);
+            }
         }
 
         if (!regids.isEmpty()) {
@@ -134,16 +135,17 @@ public class PushComponent implements JuickComponent {
         }
 
         /*** WinPhone ***/
-        List<String> urls;
+        List<String> urls = new ArrayList<>();
         if (isPM) {
-            urls = new ArrayList<>();
             String targetURL = PushQueries.getWinPhoneURL(sql, pmTo);
             if (!TextUtils.isEmpty(targetURL)) {
                 urls.add(targetURL);
             }
         } else {
-            urls = PushQueries.getWindowsTokens(sql,
-                    subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()));
+            List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
+            if (uids.size() > 0) {
+                urls = PushQueries.getWindowsTokens(sql, uids);
+            }
         }
 
 
@@ -181,16 +183,17 @@ public class PushComponent implements JuickComponent {
         }
 
         /*** iOS ***/
-        List<String> tokens;
+        List<String> tokens = new ArrayList<>();
         if (isPM) {
-            tokens = new ArrayList<>();
             String targetToken = PushQueries.getAPNSToken(sql, pmTo);
             if (targetToken != null && !targetToken.isEmpty()) {
                 tokens.add(targetToken);
             }
         } else {
-            tokens = PushQueries.getAPNSTokens(sql,
-                    subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()));
+            List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
+            if (uids.size() > 0) {
+                tokens = PushQueries.getAPNSTokens(sql, uids);
+            }
         }
         if (!tokens.isEmpty()) {
             ApnsService service = APNS.newService().withCert("/etc/juick/ios.p12", "juick")
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index bbc1568e..a7fd1e35 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -45,6 +45,8 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
 
     public JuickMessage(com.juick.Message msg) {
         super(msg);
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     @Override