From bbede8bbeb8728aac35856cc41eabea899056d74 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 24 Feb 2016 16:53:19 +0100
Subject: optionally lock conference domains as well and hide known domains in
 ui

---
 src/main/java/eu/siacs/conversations/entities/Bookmark.java | 13 +++++++++++++
 src/main/java/eu/siacs/conversations/entities/Contact.java  | 11 +++++++++++
 src/main/java/eu/siacs/conversations/entities/ListItem.java | 12 +++++++-----
 3 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index acb4bf1a3..088dfd8ae 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.jid.Jid;
@@ -57,6 +58,18 @@ public class Bookmark extends Element implements ListItem {
 		}
 	}
 
+	@Override
+	public String getDisplayJid() {
+		Jid jid = getJid();
+		if (Config.LOCK_DOMAINS_IN_CONVERSATIONS && jid != null && jid.getDomainpart().equals(Config.CONFERENCE_DOMAIN_LOCK)) {
+			return jid.getLocalpart();
+		} else if (jid != null) {
+			return jid.toString();
+		} else {
+			return null;
+		}
+	}
+
 	@Override
 	public Jid getJid() {
 		return this.getAttributeAsJid("jid");
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 9887d3ef1..691fc3e45 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -121,6 +121,17 @@ public class Contact implements ListItem, Blockable {
 		}
 	}
 
+	@Override
+	public String getDisplayJid() {
+		if (Config.LOCK_DOMAINS_IN_CONVERSATIONS && jid != null && jid.getDomainpart().equals(Config.DOMAIN_LOCK)) {
+			return jid.getLocalpart();
+		} else if (jid != null) {
+			return jid.toString();
+		} else {
+			return null;
+		}
+	}
+
 	public String getProfilePhoto() {
 		return this.photoUri;
 	}
diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java
index efc1c2b93..22aedd4b3 100644
--- a/src/main/java/eu/siacs/conversations/entities/ListItem.java
+++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java
@@ -5,13 +5,15 @@ import java.util.List;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
 public interface ListItem extends Comparable<ListItem> {
-	public String getDisplayName();
+	String getDisplayName();
 
-	public Jid getJid();
+	String getDisplayJid();
 
-	public List<Tag> getTags();
+	Jid getJid();
 
-	public final class Tag {
+	List<Tag> getTags();
+
+	final class Tag {
 		private final String name;
 		private final int color;
 
@@ -29,5 +31,5 @@ public interface ListItem extends Comparable<ListItem> {
 		}
 	}
 
-	public boolean match(final String needle);
+	boolean match(final String needle);
 }
-- 
cgit v1.2.3