From a14a28973ada020234c60680a51cdff2f9129de9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 9 May 2014 20:46:43 +0200
Subject: nicer descriptions in notificaton for images and encrypted messages

---
 src/eu/siacs/conversations/utils/UIHelper.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/eu/siacs/conversations/utils/UIHelper.java')

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 1c52ff0b..8baa3c25 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -389,7 +389,7 @@ public class UIHelper {
 							context, true));
 			mBuilder.setContentTitle(conversation.getName(useSubject));
 			if (notify) {
-				mBuilder.setTicker(conversation.getLatestMessage().getBody().trim());
+				mBuilder.setTicker(conversation.getLatestMessage().getReadableBody(context));
 			}
 			StringBuilder bigText = new StringBuilder();
 			List<Message> messages = conversation.getMessages();
@@ -397,10 +397,10 @@ public class UIHelper {
 			for (int i = messages.size() - 1; i >= 0; --i) {
 				if (!messages.get(i).isRead()) {
 					if (i == messages.size() - 1) {
-						firstLine = messages.get(i).getBody().trim();
+						firstLine = messages.get(i).getReadableBody(context);
 						bigText.append(firstLine);
 					} else {
-						firstLine = messages.get(i).getBody().trim();
+						firstLine = messages.get(i).getReadableBody(context);
 						bigText.insert(0, firstLine + "\n");
 					}
 				} else {
@@ -422,7 +422,7 @@ public class UIHelper {
 					names.append(unread.get(i).getName(useSubject));
 				}
 				style.addLine(Html.fromHtml("<b>" + unread.get(i).getName(useSubject)
-						+ "</b> " + unread.get(i).getLatestMessage().getBody().trim()));
+						+ "</b> " + unread.get(i).getLatestMessage().getReadableBody(context)));
 			}
 			mBuilder.setContentTitle(unread.size() + " unread Conversations");
 			mBuilder.setContentText(names.toString());
-- 
cgit v1.2.3