Change summary
src/main/java/eu/siacs/conversations/entities/Contact.java | 2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 6
2 files changed, 7 insertions(+), 1 deletion(-)
Detailed changes
@@ -151,7 +151,7 @@ public class Contact implements ListItem, Blockable {
}
public String getDisplayName() {
- if (isSelf()) {
+ if (isSelf() && TextUtils.isEmpty(this.systemName)) {
final String displayName = account.getDisplayName();
if (!Strings.isNullOrEmpty(displayName)) {
return displayName;
@@ -1080,6 +1080,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
}
}
+ final Contact self = account.getSelfContact();
+ if (self.match(this, needle)) {
+ self.setSystemName("Note to Self");
+ this.contacts.add(self);
+ }
+
for (Bookmark bookmark : account.getBookmarks()) {
if (bookmark.match(this, needle)) {
if (bookmark.getJid().toString().equals("discuss@conference.soprani.ca")) {