Merge branch 'master' into xmpp_position (#51)

Signed-off-by: Andrea Cappelli <[email protected]>
kontalk · Mar 18, 2014 · 83bede3 · 83bede3
2 parents 25c8720 + 98a3470
commit 83bede3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/org/kontalk/ui/ConversationListFragment.java b/src/org/kontalk/ui/ConversationListFragment.java
@@ -136,6 +136,7 @@ public void onSaveInstanceState(Bundle outState) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setRetainInstance(true);
         setHasOptionsMenu(true);
     }
 

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;