From bfb2f44f8f7a9d02c49c2d0ee48ee86ab60c5448 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sat, 13 Feb 2021 17:43:44 +0900
Subject: [PATCH] Fixed favorite tag duplication

---
 app/src/main/java/xyz/quaver/pupil/Pupil.kt                   | 4 ++++
 .../main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
index cf3f35aa..ef94a08c 100644
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -125,6 +125,10 @@ class Pupil : Application() {
         favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
         searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")
 
+        favoriteTags.filter { it.tag.contains('_') }.forEach {
+            favoriteTags.remove(it)
+        }
+
         /*
         if (BuildConfig.DEBUG)
             FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)*/
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
index 064f3d0c..3e922ba1 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
@@ -25,6 +25,7 @@ import android.graphics.drawable.Animatable
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.EditorInfo
@@ -110,7 +111,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
     ) {
       when(item) {
             is TagSuggestion -> {
-                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
+                val tag = "${item.n}:${item.s}"
 
                 leftIcon?.setImageDrawable(
                     ResourcesCompat.getDrawable(