diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-03-09 20:37:57 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-03-09 20:37:57 +0100 |
| commit | 5ab0d6fac5c0b4ee5a68ce0cc376b96eea888742 (patch) | |
| tree | ade2b9f1a5b9d06dbd64b9dcd0e26a934020aeb7 /src/main | |
| parent | e67f7ecb404331bc660dadbce13505aab8f66eb0 (diff) | |
show conversation time as last clear date when empty
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |