Merge trz/rename into trz/rebase

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 9d8cc0ba..211572e7 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -20,6 +20,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
@@ -71,7 +72,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             view.findViewById(R.id.conversationListRowFrame).setBackgroundColor(c);
 		}
 		TextView convName = (TextView) view.findViewById(R.id.conversation_name);
-		if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+		if (conversation.getMode() == Conversation.MODE_SINGLE || ConversationsPlusPreferences.useSubject()) {
 			convName.setText(conversation.getName());
 		} else {
 			convName.setText(conversation.getJid().toBareJid().toString());