From 1901abd05fc051b776e2bbb10295f936408a0843 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Apr 2016 21:25:06 +0200
Subject: expert setting to manually change presence

---
 .../eu/siacs/conversations/entities/Contact.java   | 30 ++++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

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

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 691fc3e4..e608688b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.entities;
 
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.Cursor;
 
 import org.json.JSONArray;
@@ -141,25 +142,14 @@ public class Contact implements ListItem, Blockable {
 	}
 
 	@Override
-	public List<Tag> getTags() {
+	public List<Tag> getTags(Context context) {
 		final ArrayList<Tag> tags = new ArrayList<>();
 		for (final String group : getGroups()) {
 			tags.add(new Tag(group, UIHelper.getColorForName(group)));
 		}
-		switch (getMostAvailableStatus()) {
-			case CHAT:
-			case ONLINE:
-				tags.add(new Tag("online", 0xff259b24));
-				break;
-			case AWAY:
-				tags.add(new Tag("away", 0xffff9800));
-				break;
-			case XA:
-				tags.add(new Tag("not available", 0xfff44336));
-				break;
-			case DND:
-				tags.add(new Tag("dnd", 0xfff44336));
-				break;
+		Presence.Status status = getMostAvailableStatus();
+		if (status != Presence.Status.OFFLINE) {
+			tags.add(UIHelper.getTagForStatus(context, status));
 		}
 		if (isBlocked()) {
 			tags.add(new Tag("blocked", 0xff2e2f3b));
@@ -167,7 +157,7 @@ public class Contact implements ListItem, Blockable {
 		return tags;
 	}
 
-	public boolean match(String needle) {
+	public boolean match(Context context, String needle) {
 		if (needle == null || needle.isEmpty()) {
 			return true;
 		}
@@ -175,7 +165,7 @@ public class Contact implements ListItem, Blockable {
 		String[] parts = needle.split("\\s+");
 		if (parts.length > 1) {
 			for(int i = 0; i < parts.length; ++i) {
-				if (!match(parts[i])) {
+				if (!match(context, parts[i])) {
 					return false;
 				}
 			}
@@ -183,13 +173,13 @@ public class Contact implements ListItem, Blockable {
 		} else {
 			return 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;
 			}
-- 
cgit v1.2.3


From 29616d02a8e97a9044daec286bdfa7c862108fa4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 27 Apr 2016 16:43:02 +0200
Subject: removed unused config variables

---
 src/main/java/eu/siacs/conversations/entities/Contact.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index e608688b..8721d9c4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -124,9 +124,7 @@ 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) {
+		if (jid != null) {
 			return jid.toString();
 		} else {
 			return null;
-- 
cgit v1.2.3