From bfc5000b6aa3d401ad80e04c43a6671aa9c2c619 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Fri, 11 Mar 2016 21:31:30 +0100 Subject: Fixes FS#139: Do not merge messages at all --- .../thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java') diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java index 63ed8dc7..2e7e8354 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java @@ -175,6 +175,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog { */ protected void displayMessageSentTime(View view, Message message) { TextView timeSent = (TextView) view.findViewById(R.id.dlgMsgDetTimeSent); - timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getMergedTimeSent()))); + timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getTimeSent()))); } } -- cgit v1.2.3