Empty conversation should not sort to top always

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java | 1 
src/main/java/eu/siacs/conversations/entities/Message.java      | 4 +++
2 files changed, 5 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -691,6 +691,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 Message message = new Message(this, "", Message.ENCRYPTION_NONE);
                 message.setType(Message.TYPE_STATUS);
                 message.setTime(Math.max(getCreated(), getLastClearHistory().getTimestamp()));
+                message.setTimeReceived(Math.max(getCreated(), getLastClearHistory().getTimestamp()));
                 return message;
             } else {
                 return this.messages.get(this.messages.size() - 1);

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -528,6 +528,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         this.timeSent = time;
     }
 
+    public void setTimeReceived(long time) {
+        this.timeReceived = time;
+    }
+
     public String getEncryptedBody() {
         return this.encryptedBody;
     }