kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Simplify country detection further.

Browse Source
This commit is contained in:
Isira Seneviratne 2023-01-16 12:14:30 +05:30
parent e68677ab6d
commit 8ccc91024e
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/github/libretube/util/LocaleHelper.kt
View File

@ -2,7 +2,6 @@ package com.github.libretube.util
import android.content.Context
import android.content.res.Configuration
import android.content.res.Resources
import android.os.Build
import android.telephony.TelephonyManager
import androidx.core.content.getSystemService
@ -40,30 +39,30 @@ object LocaleHelper {
@Suppress("DEPRECATION")
private fun updateResourcesLegacy(context: Context, locale: Locale) {
Locale.setDefault(locale)
val resources: Resources = context.resources
val resources = context.resources
val configuration = resources.configuration
configuration.locale = locale
resources.updateConfiguration(configuration, resources.displayMetrics)
}
private fun getDetectedCountry(context: Context): String {
return detectSIMCountry(context).ifEmpty {
detectNetworkCountry(context).ifEmpty {
detectLocaleCountry(context).ifEmpty { "UK" }
}
}
return detectSIMCountry(context)
?: detectNetworkCountry(context)
?: detectLocaleCountry(context)
?: "UK"
}
private fun detectSIMCountry(context: Context): String {
return context.getSystemService<TelephonyManager>()?.simCountryIso.orEmpty()
private fun detectSIMCountry(context: Context): String? {
return context.getSystemService<TelephonyManager>()?.simCountryIso?.ifEmpty { null }
}
private fun detectNetworkCountry(context: Context): String {
return context.getSystemService<TelephonyManager>()?.networkCountryIso.orEmpty()
private fun detectNetworkCountry(context: Context): String? {
return context.getSystemService<TelephonyManager>()?.networkCountryIso?.ifEmpty { null }
}
private fun detectLocaleCountry(context: Context): String {
private fun detectLocaleCountry(context: Context): String? {
return ConfigurationCompat.getLocales(context.resources.configuration)[0]!!.country
.ifEmpty { null }
}
fun getAvailableCountries(): List<Country> {