aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-09 19:06:43 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-09 19:06:43 +0100
commit56b4ac17517c37afa09c65239687a47c1a7c0f5b (patch)
treeb68cf15998cc363cc5e8b09a91291b13968c1031 /src/main/java/eu
parenteb9e9883611f5f5c0c2bd7466e434794ab074c22 (diff)
use isBareJid instead of getResourcePart().isEmpty()
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java2
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 5d133e87..d2ba6f51 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/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());
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 16239ec8..3ebb9390 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/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();