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 a34762c5c..a9c12bdb5 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 @@ -122,7 +122,7 @@ class CurrencyRepository( * @return The resolved currency symbol or the original symbol if no alias was found */ fun resolveAlias(symbol: String): String { - return currencySymbolAliases[symbol] ?: symbol + return currencySymbolAliases[symbol] ?: symbol.uppercase() } suspend fun convertCurrency( @@ -168,7 +168,7 @@ class CurrencyRepository( } suspend fun isValidCurrency(symbol: String): Boolean { - val isoSymbol = currencySymbolAliases[symbol] ?: symbol + val isoSymbol = currencySymbolAliases[symbol] ?: symbol.uppercase() return withContext(Dispatchers.IO) { AppDatabase.getInstance(context).currencyDao().exists(isoSymbol) } diff --git a/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt index 7a19b6e44..c2a5df88a 100644 --- a/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt +++ b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt @@ -28,7 +28,7 @@ class CurrencyConverter( private val topCurrencies = arrayOf("USD", "EUR", "JPY", "GBP", "AUD") override suspend fun isValidUnit(symbol: String): Boolean { - return repository.isValidCurrency(symbol.uppercase()) + return repository.isValidCurrency(symbol) } @@ -76,7 +76,7 @@ class CurrencyConverter( value: Double, toUnit: String? ): UnitConverter { - val fromIsoCode = repository.resolveAlias(fromUnit.uppercase()) + val fromIsoCode = repository.resolveAlias(fromUnit) val toIsoCode = toUnit?.let { repository.resolveAlias(it) } val values = repository.convertCurrency(fromIsoCode, value, toIsoCode).map {