From 6718767d6be408408b6041b706730b6bd766f140 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:52:16 +0200 Subject: [PATCH] Currency converter: Fix crash when system uses unsupported locale Close #950 --- .../de/mm20/launcher2/currencies/CurrencyRepository.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt b/data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt index 2d5e6b4e..1e67d3e2 100644 --- a/data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt +++ b/data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt @@ -15,8 +15,16 @@ class CurrencyRepository( private val context: Context, ) { + private fun getOwnCurrency(): String { + return try { + java.util.Currency.getInstance(Locale.getDefault()).currencyCode ?: "USD" + } catch (e: IllegalArgumentException) { + "USD" + } + } + private val currencySymbolAliases = buildMap { - val ownCurrency = java.util.Currency.getInstance(Locale.getDefault()).currencyCode ?: "USD" + val ownCurrency = getOwnCurrency() put("€", "EUR")