From 3331ea024b36a526e7ea87430a4ec04cddcf967a Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Wed, 3 Jul 2024 22:41:33 +0200
Subject: [PATCH] Revert "Reuse collator instance"

This reverts commit 90de026e49a02ee42d6d406a19e3807e6786c951.

Close #915, Close #907
---
 .../mm20/launcher2/search/SavableSearchable.kt  |  5 +++--
 .../java/de/mm20/launcher2/text/Collator.kt     | 17 -----------------
 .../appshortcuts/AppShortcutConfigActivity.kt   |  5 +++--
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 core/base/src/main/java/de/mm20/launcher2/text/Collator.kt

diff --git a/core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt b/core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt
index 1a1b5f1f..c6448c92 100644
--- a/core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import de.mm20.launcher2.icons.LauncherIcon
 import de.mm20.launcher2.icons.StaticLauncherIcon
 import de.mm20.launcher2.ktx.romanize
-import de.mm20.launcher2.text.Collator
+import java.text.Collator
 
 interface SavableSearchable : Searchable, Comparable<SavableSearchable>  {
     val key: String
@@ -37,7 +37,8 @@ interface SavableSearchable : Searchable, Comparable<SavableSearchable>  {
     override fun compareTo(other: SavableSearchable): Int {
         val label1 = labelOverride ?: label
         val label2 = other.labelOverride ?: other.label
-        return Collator.compare(label1.romanize(), label2.romanize())
+        return Collator.getInstance().apply { strength = Collator.SECONDARY }
+            .compare(label1.romanize(), label2.romanize())
     }
 
     val domain: String
diff --git a/core/base/src/main/java/de/mm20/launcher2/text/Collator.kt b/core/base/src/main/java/de/mm20/launcher2/text/Collator.kt
deleted file mode 100644
index c529895a..00000000
--- a/core/base/src/main/java/de/mm20/launcher2/text/Collator.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.mm20.launcher2.text
-
-import android.icu.text.Collator
-import kotlin.concurrent.getOrSet
-
-
-private val threadLocalCollator = ThreadLocal.withInitial { 
-    android.icu.text.Collator.getInstance().apply { 
-        strength = android.icu.text.Collator.SECONDARY
-    }
-}
-
-val Collator = threadLocalCollator.getOrSet { 
-    android.icu.text.Collator.getInstance().apply { 
-        strength = android.icu.text.Collator.SECONDARY
-    }
-}
\ No newline at end of file
diff --git a/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutConfigActivity.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutConfigActivity.kt
index a63f42b3..08f378c7 100644
--- a/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutConfigActivity.kt
+++ b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutConfigActivity.kt
@@ -9,9 +9,9 @@ import android.os.Process
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.ktx.romanize
 import de.mm20.launcher2.search.AppProfile
-import de.mm20.launcher2.text.Collator
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import java.text.Collator
 
 class AppShortcutConfigActivity(
     private val launcherActivityInfo: LauncherActivityInfo,
@@ -32,6 +32,7 @@ class AppShortcutConfigActivity(
 
         val label1 = label
         val label2 = other.label
-        return Collator.compare(label1.romanize(), label2.romanize())
+        return Collator.getInstance().apply { strength = Collator.SECONDARY }
+            .compare(label1.romanize(), label2.romanize())
     }
 }
\ No newline at end of file