From b1a3d09ca6a4be59b57e2f7b1cdc8a245d60a858 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 14 Mar 2014 22:40:56 +0100 Subject: use conference subject to identiy room --- src/eu/siacs/conversations/ui/ConversationFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java') diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 71d4100f0..d8ead9a62 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -62,6 +62,8 @@ public class ConversationFragment extends Fragment { private String pastedText = null; protected Bitmap selfBitmap; + + private boolean useSubject = true; private IntentSender askForPassphraseIntent = null; @@ -214,7 +216,7 @@ public class ConversationFragment extends Fragment { if (item.getConversation().getMode() == Conversation.MODE_SINGLE) { viewHolder.imageView.setImageBitmap(mBitmapCache - .get(item.getConversation().getName(), item + .get(item.getConversation().getName(useSubject), item .getConversation().getContact(), getActivity() .getApplicationContext())); @@ -250,7 +252,7 @@ public class ConversationFragment extends Fragment { .getApplicationContext())); } else { viewHolder.imageView.setImageBitmap(mBitmapCache - .get(item.getConversation().getName(), + .get(item.getConversation().getName(useSubject), null, getActivity() .getApplicationContext())); } @@ -330,7 +332,7 @@ public class ConversationFragment extends Fragment { if (!activity.shouldPaneBeOpen()) { activity.getSlidingPaneLayout().closePane(); activity.getActionBar().setDisplayHomeAsUpEnabled(true); - activity.getActionBar().setTitle(conversation.getName()); + activity.getActionBar().setTitle(conversation.getName(useSubject)); activity.invalidateOptionsMenu(); } -- cgit v1.2.3