1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index fa30443d..428758d6 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.entities;
 
 import android.graphics.Color;
+import android.content.Context;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,9 +64,7 @@ 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) {
+		if (jid != null) {
 			return jid.toString();
 		} else {
 			return null;
@@ -78,7 +77,7 @@ public class Bookmark extends Element implements ListItem {
 	}
 
 	@Override
-	public List<Tag> getTags() {
+	public List<Tag> getTags(Context context) {
 		ArrayList<Tag> tags = new ArrayList<Tag>();
 		for (Element element : getChildren()) {
 			if (element.getName().equals("group") && element.getContent() != null) {
@@ -121,7 +120,8 @@ public class Bookmark extends Element implements ListItem {
 		}
 	}
 
-	public boolean match(String needle) {
+	@Override
+	public boolean match(Context context, String needle) {
 		if (needle == null) {
 			return true;
 		}
@@ -129,12 +129,12 @@ public class Bookmark extends Element implements ListItem {
 		final Jid jid = getJid();
 		return (jid != null && jid.toString().contains(needle)) ||
 			getDisplayName().toLowerCase(Locale.US).contains(needle) ||
-			matchInTag(needle);
+			matchInTag(context, needle);
 	}
 
-	private boolean matchInTag(String needle) {
+	private boolean matchInTag(Context context, String needle) {
 		needle = needle.toLowerCase(Locale.US);
-		for (Tag tag : getTags()) {
+		for (Tag tag : getTags(context)) {
 			if (tag.getName().toLowerCase(Locale.US).contains(needle)) {
 				return true;
 			}