use isBareJid instead of getResourcePart().isEmpty()

iNPUTmice created 11 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java   | 2 
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -280,7 +280,7 @@ public class ConversationFragment extends Fragment {
 						if (message.getStatus() <= Message.STATUS_RECEIVED) {
 							if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
 								if (message.getCounterpart() != null) {
-									if (!message.getCounterpart().getResourcepart().isEmpty()) {
+									if (!message.getCounterpart().isBareJid()) {
 										highlightInConference(message.getCounterpart().getResourcepart());
 									} else {
 										highlightInConference(message.getCounterpart().toString());

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -304,7 +304,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	private String getDisplayedMucCounterpart(final Jid counterpart) {
 		if (counterpart==null) {
 			return "";
-		} else if (!counterpart.getResourcepart().isEmpty()) {
+		} else if (!counterpart.isBareJid()) {
 			return counterpart.getResourcepart();
 		} else {
 			return counterpart.toString();