fix crash in settings when locale is badly initialized

feature/top10
Razmig Sarkissian 7 years ago
parent ae009f468f
commit 457d02dd07
  1. 12
      app/src/main/java/net/pokeranalytics/android/util/Preferences.kt

@ -70,9 +70,16 @@ class Preferences {
} }
} }
currencyLocale = try { val defaultLocale = Locale.getDefault()
Locale.getDefault() val defaultCurrency = try {
Currency.getInstance(defaultLocale)
} catch (ex: Exception) { } catch (ex: Exception) {
null
}
currencyLocale = defaultCurrency?.let {
defaultLocale
} ?: run {
when (Locale.getDefault().language) { when (Locale.getDefault().language) {
"en" -> Locale("en", "US") "en" -> Locale("en", "US")
"fr" -> Locale("fr", "FR") "fr" -> Locale("fr", "FR")
@ -83,6 +90,7 @@ class Preferences {
else -> Locale("en", "US") else -> Locale("en", "US")
} }
} }
return currencyLocale!! return currencyLocale!!
} }

Loading…
Cancel
Save