✨ feat(data): Handle potential exception in language substring

🐛 fix(dataStore): Improve language handling in DataStoreManager
maxrave-dev · Dec 31, 2024 · e0392fc · e0392fc
1 parent aad061b
commit e0392fc
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 69 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/dataStore/DataStoreManager.kt b/app/src/main/java/com/maxrave/simpmusic/data/dataStore/DataStoreManager.kt
@@ -361,9 +361,9 @@ class DataStoreManager(
 
     val translationLanguage =
         settingsDataStore.data.map { preferences ->
-            preferences[TRANSLATION_LANGUAGE] ?: if (language.first().length >= 2) {
-                language
-                    .first()
+            val languageValue = language.first()
+            preferences[TRANSLATION_LANGUAGE] ?: if (languageValue.length >= 2) {
+                languageValue
                     .substring(0..1)
             } else {
                 "en"

diff --git a/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt b/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt
@@ -161,7 +161,11 @@ class MainRepository(
                     combine(dataStoreManager.location, dataStoreManager.language) { location, language ->
                         Pair(location, language)
                     }.collectLatest { (location, language) ->
-                        youTube.locale = YouTubeLocale(location, language.substring(0..1))
+                        youTube.locale = YouTubeLocale(location, try {
+                            language.substring(0..1)
+                        } catch (e: Exception) {
+                            "en"
+                        })
                     }
                 }
             val ytCookieJob =