From 5ab0d6fac5c0b4ee5a68ce0cc376b96eea888742 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Mar 2017 20:37:57 +0100
Subject: show conversation time as last clear date when empty

---
 src/main/java/de/pixart/messenger/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 260678728..fe8031b2a 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -472,7 +472,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         if (this.messages.size() == 0) {
             Message message = new Message(this, "", Message.ENCRYPTION_NONE);
             message.setType(Message.TYPE_STATUS);
-            message.setTime(getCreated());
+            message.setTime(Math.max(getCreated(), getLastClearHistory()));
             return message;
         } else {
             Message message = this.messages.get(this.messages.size() - 1);
-- 
cgit v1.2.3