diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 21:52:26 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-13 21:52:26 +0200 |
commit | 649b52222a4cecbb184eb7bea3cf685fac2801df (patch) | |
tree | 99ff28b5cb936ab9f17ae247b280bde4054e4c8d /src/main/java/de/pixart/messenger/entities/Contact.java | |
parent | db5a5bac17440231821f2e9d480046d7ac210047 (diff) |
ignore bookmark name of 'None'
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Contact.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Contact.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index 2af40e1fb..b69f421ff 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -5,6 +5,7 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; +import android.text.TextUtils; import org.json.JSONArray; import org.json.JSONException; @@ -112,13 +113,13 @@ public class Contact implements ListItem, Blockable { } public String getDisplayName() { - if (Config.X509_VERIFICATION && this.commonName != null && !this.commonName.isEmpty()) { + if (Config.X509_VERIFICATION && !TextUtils.isEmpty(this.commonName)) { return this.commonName; - } else if (this.systemName != null && !this.systemName.isEmpty()) { + } else if (!TextUtils.isEmpty(this.systemName)) { return this.systemName; - } else if (this.serverName != null && !this.serverName.isEmpty()) { + } else if (!TextUtils.isEmpty(this.serverName)) { return this.serverName; - } else if (this.presenceName != null && !this.presenceName.isEmpty() && mutualPresenceSubscription()) { + } else if (!TextUtils.isEmpty(this.presenceName) && mutualPresenceSubscription()) { return this.presenceName; } else if (jid.getLocal() != null) { return JidHelper.localPartOrFallback(jid); @@ -155,7 +156,7 @@ public class Contact implements ListItem, Blockable { } public boolean match(Context context, String needle) { - if (needle == null || needle.isEmpty()) { + if (TextUtils.isEmpty(needle)) { return true; } needle = needle.toLowerCase(Locale.US).trim(); |