Merge pull request #247 from wireapp/bug/timestamp_npe

[AN-4600] Adds fix for NPE when setting message time stamp
chris1206 · Oct 18, 2016 · 3f3a0c6 · 3f3a0c6
2 parents 7e46fb8 + 8a0f442
commit 3f3a0c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...n/java/com/waz/zclient/pages/main/conversation/views/row/footer/FooterViewController.java b/...n/java/com/waz/zclient/pages/main/conversation/views/row/footer/FooterViewController.java
@@ -232,7 +232,7 @@ private void updateMessageStatusLabel() {
         Instant messageTime = message.isEdited() || message.isDeleted() ?
                               message.getEditTime() :
                               message.getTime();
-        String timestamp = ZTimeFormatter.getSingleMessageTime(getView().getContext(), DateTimeUtils.toDate(messageTime));
+        String timestamp = messageTime == null ? "" : ZTimeFormatter.getSingleMessageTime(getView().getContext(), DateTimeUtils.toDate(messageTime));
         String status;
         Runnable linkRunnable = null;
         boolean linkUnderlined = true;