aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities/Conversation.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-07 23:28:35 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-07 23:28:42 +0200
commit903a3d17f2055bdc5ba4f316419b158ce453bfda (patch)
treef7048f145227143c22122574579eb0d3ff3e118e /src/main/java/de/pixart/messenger/entities/Conversation.java
parentb1daabbb86e41d0a07737e0951530322f1cdedfe (diff)
return contact and account.getServer() as String
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 81c52aa1c..3f66f93b6 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -501,7 +501,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
}
- public String getName() {
+ public CharSequence getName() {
if (getMode() == MODE_MULTI) {
final String subject = getMucOptions().getSubject();
Bookmark bookmark = getBookmark();
@@ -520,7 +520,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
}
} else if (isWithStranger()) {
- return contactJid.asBareJid().toString();
+ return contactJid;
} else {
return this.getContact().getDisplayName();
}