Fix #140: show actual send timestamp also in message details

Signed-off-by: Daniele Ricci <[email protected]>
kontalk · Mar 17, 2014 · d48e634 · d48e634
1 parent a37c8d0
commit d48e634
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/org/kontalk/util/MessageUtils.java b/src/org/kontalk/util/MessageUtils.java
@@ -494,7 +494,8 @@ else if ((securityFlags & Coder.SECURITY_ERROR_PUBLIC_KEY_UNAVAILABLE) != 0) {
                 case Messages.STATUS_RECEIVED:
                 case Messages.STATUS_NOTDELIVERED:
                     resId = R.string.sent_label;
-                    timestamp = msg.getTimestamp();
+                    long serverTime = msg.getServerTimestamp();
+                    timestamp = serverTime > 0 ? serverTime : msg.getTimestamp();
                     break;
                 default:
                     resId = -1;