From 53d1b4a30b710e6761059d4afd0423a1b7abd512 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 20 Mar 2023 19:44:56 -0500
Subject: [PATCH] Dedup across system tags and server tags

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

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index a39b7801b33c44460f89816c8ee8afb818a18796..56080512a9b367d13a16d4db3f2a6f608d694a4f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -200,7 +200,7 @@ public class Contact implements ListItem, Blockable {
 
     @Override
     public List<Tag> getTags(Context context) {
-        final ArrayList<Tag> tags = new ArrayList<>();
+        final HashSet<Tag> tags = new HashSet<>();
         tags.addAll(getGroupTags());
         for (final String tag : getSystemTags(true)) {
             tags.add(new Tag(tag, UIHelper.getColorForName(tag)));
@@ -215,7 +215,7 @@ public class Contact implements ListItem, Blockable {
         if (!showInRoster() && getSystemAccount() != null) {
             tags.add(new Tag("Android", UIHelper.getColorForName("Android")));
         }
-        return tags;
+        return new ArrayList<>(tags);
     }
 
     public boolean match(Context context, String needle) {