narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use isBareJid instead of getResourcePart().isEmpty()

Browse source
This commit is contained in:
iNPUTmice 2014-11-09 19:06:43 +01:00
parent eb9e988361
commit 56b4ac1751
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

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

2
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

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