Fix UiPrefsFragmentTest failure by removing redundant languages at pr…

…eference At ContextLocaleExt.kt, remove conflicting locales API 24 or above
TeamAmaze · Feb 19, 2024 · e7eb3d8 · e7eb3d8
1 parent 4f39602
commit e7eb3d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/src/main/java/com/amaze/filemanager/utils/ContextLocaleExt.kt b/app/src/main/java/com/amaze/filemanager/utils/ContextLocaleExt.kt
@@ -21,6 +21,8 @@
 package com.amaze.filemanager.utils
 
 import android.content.Context
+import android.os.Build
+import android.os.Build.VERSION_CODES.N
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import com.amaze.filemanager.R
@@ -50,6 +52,12 @@ fun Context.getLocaleListFromXml(): LocaleListCompat {
         e.printStackTrace()
     }
 
+    // Remove locale tags that would produce same locale on Android N or above
+    if (Build.VERSION.SDK_INT >= N) {
+        tagsList.remove("id")
+        tagsList.remove("he")
+    }
+
     return LocaleListCompat.forLanguageTags(tagsList.joinToString(","))
 }
 

diff --git a/...c/test/java/com/amaze/filemanager/ui/fragments/preferencefragments/UiPrefsFragmentTest.kt b/...c/test/java/com/amaze/filemanager/ui/fragments/preferencefragments/UiPrefsFragmentTest.kt
@@ -51,7 +51,12 @@ import kotlin.random.Random
  * Tests for [UiPrefsFragment].
  */
 @Config(
-    sdk = [Build.VERSION_CODES.KITKAT, Build.VERSION_CODES.P, Build.VERSION_CODES.R],
+    sdk = [
+        Build.VERSION_CODES.KITKAT,
+        Build.VERSION_CODES.N,
+        Build.VERSION_CODES.P,
+        Build.VERSION_CODES.R
+    ],
     shadows = [
         ShadowMultiDex::class,
         ShadowStorageManager::class,