jonas/Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 10 Wiki Activity

Fix unit converter aliases

Browse Source
This commit is contained in:
MM20
2025-09-28 15:02:16 +02:00
parent 2e91c8df61
commit 90ce8c1233
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt
View File

@@ -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)
}

4
data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt
View File

@@ -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 {