Merge pull request #27 from Leanplum/feature/fix-null-ptr

fix(inbox): fixing null pointer exception

Author: milos1290

AndroidSDK/src/com/leanplum/LeanplumInbox.java

@@ -306,9 +306,25 @@ public List<String> messagesIds() {
     try {
       Collections.sort(messageIds, new Comparator<String>() {
         @Override
-        public int compare(String firstMessage, String secondMessage) {
-          Date firstDate = messageForId(firstMessage).getDeliveryTimestamp();
-          Date secondDate = messageForId(secondMessage).getDeliveryTimestamp();
+        public int compare(String firstMessageId, String secondMessageId) {
+          // Message that is null will be moved to the back of the list.
+          LeanplumInboxMessage firstMessage = messageForId(firstMessageId);
+          if (firstMessage == null) {
+            return -1;
+          }
+          LeanplumInboxMessage secondMessage = messageForId(secondMessageId);
+          if (secondMessage == null) {
+            return 1;
+          }
+          // Message with null date will be moved to the back of the list.
+          Date firstDate = firstMessage.getDeliveryTimestamp();
+          if (firstDate == null) {
+            return -1;
+          }
+          Date secondDate = secondMessage.getDeliveryTimestamp();
+          if (secondDate == null) {
+            return 1;
+          }
           return firstDate.compareTo(secondDate);
         }
       });

AndroidSDK/src/com/leanplum/NewsfeedMessage.java

@@ -146,9 +146,13 @@ public Date deliveryTimestamp() {
   }
 
   /**
-   * Returns the delivery timestamp of the newsfeed message.
+   * Returns the delivery timestamp of the newsfeed message,
+   * or null if delivery timestamp is not present.
    */
   public Date getDeliveryTimestamp() {
+    if (deliveryTimestamp == null) {
+      return null;
+    }
     return new Date(deliveryTimestamp);
   }