From 94389ac22a1dd3d4e9bff1b64b6c74fa82c55084 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 31 Aug 2014 18:55:15 +0200
Subject: show merged time and status in message adapter

---
 src/eu/siacs/conversations/entities/Message.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/eu/siacs/conversations/entities/Message.java')

diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index 2dc1bfb5..84aac4f5 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -336,6 +336,24 @@ public class Message extends AbstractEntity {
 		}
 		return body.trim();
 	}
+	
+	public int getMergedStatus() {
+		Message next = this.next();
+		if (this.mergable(next)) {
+			return next.getMergedStatus();
+		} else {
+			return getStatus();
+		}
+	}
+	
+	public long getMergedTimeSent() {
+		Message next = this.next();
+		if (this.mergable(next)) {
+			return next.getMergedTimeSent();
+		} else {
+			return getTimeSent();
+		}
+	}
 
 	public boolean wasMergedIntoPrevious() {
 		Message prev = this.prev();
-- 
cgit v1.2.3