From 97b52abaf9dc43f643c3925c2c836d752b993dd8 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 2 Sep 2014 16:00:03 +0200
Subject: fixed #410 by removing that config option

---
 src/eu/siacs/conversations/utils/UIHelper.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 49645475..41724596 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -215,7 +215,7 @@ public class UIHelper {
 		List<User> members = conversation.getMucOptions().getUsers();
 		if (members.size() == 0) {
 			return getUnknownContactPicture(
-					new String[] { conversation.getName(false) }, size,
+					new String[] { conversation.getName() }, size,
 					bgColor, fgColor);
 		}
 		ArrayList<String> names = new ArrayList<String>();
@@ -332,7 +332,6 @@ public class UIHelper {
 
 		SharedPreferences preferences = PreferenceManager
 				.getDefaultSharedPreferences(context);
-		boolean useSubject = preferences.getBoolean("use_subject_in_muc", true);
 		boolean showNofifications = preferences.getBoolean("show_notification",
 				true);
 		boolean vibrate = preferences.getBoolean("vibrate_on_notification",
@@ -381,7 +380,7 @@ public class UIHelper {
 			Conversation conversation = unread.get(0);
 			targetUuid = conversation.getUuid();
 			mBuilder.setLargeIcon(conversation.getImage(context, 64));
-			mBuilder.setContentTitle(conversation.getName(useSubject));
+			mBuilder.setContentTitle(conversation.getName());
 			if (notify) {
 				mBuilder.setTicker(conversation.getLatestMessage()
 						.getReadableBody(context));
@@ -413,12 +412,12 @@ public class UIHelper {
 			for (int i = 0; i < unread.size(); ++i) {
 				targetUuid = unread.get(i).getUuid();
 				if (i < unread.size() - 1) {
-					names.append(unread.get(i).getName(useSubject) + ", ");
+					names.append(unread.get(i).getName() + ", ");
 				} else {
-					names.append(unread.get(i).getName(useSubject));
+					names.append(unread.get(i).getName());
 				}
 				style.addLine(Html.fromHtml("<b>"
-						+ unread.get(i).getName(useSubject)
+						+ unread.get(i).getName()
 						+ "</b> "
 						+ unread.get(i).getLatestMessage()
 								.getReadableBody(context)));
-- 
cgit v1.2.3