sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use presence name not server name when verification is being used

This commit is contained in:
Daniel Gultsch 2015-12-19 13:07:38 +01:00
parent 15c8cb8ac6
commit ade89beb96
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/entities/Contact.java
View File

@ -105,12 +105,12 @@ public class Contact implements ListItem, Blockable {
}
public String getDisplayName() {
if (this.systemName != null && !Config.X509_VERIFICATION) {
if (this.presenceName != null && Config.X509_VERIFICATION) {
return this.presenceName;
} else if (this.systemName != null) {
return this.systemName;
} else if (this.serverName != null) {
return this.serverName;
} else if (this.systemName != null) {
return this.systemName;
} else if (this.presenceName != null) {
return this.presenceName;
} else if (jid.hasLocalpart()) {