From 903a3d17f2055bdc5ba4f316419b158ce453bfda Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 7 Apr 2018 23:28:35 +0200
Subject: return contact and account.getServer() as String

---
 src/main/java/de/pixart/messenger/entities/Conversation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')

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();
         }
-- 
cgit v1.2.3