thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

show self contact with display name

Browse source 
(cherry picked from commit 9db0808306)
This commit is contained in:
Daniel Gultsch 2021-01-20 08:15:06 +01:00 • committed by Christian Schneppe
parent 31d98ddb40
commit 81a7d0c33f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/entities/Contact.java
View file

@ -8,6 +8,8 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.google.common.base.Strings;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@ -132,6 +134,12 @@ public class Contact implements ListItem, Blockable {
}
public String getDisplayName() {
if (isSelf()) {
final String displayName = account.getDisplayName();
if (!Strings.isNullOrEmpty(displayName)) {
return displayName;
}
}
if (Config.X509_VERIFICATION && !TextUtils.isEmpty(this.commonName)) {
return this.commonName;
} else if (!TextUtils.isEmpty(this.systemName)) {