GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-08-05 16:25:07 +03:00
commit 5deed580ae
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/res/src/main/java/com/tangem/core/res/Resources.kt
View file

@ -29,7 +29,7 @@ fun Resources.getStringSafe(@StringRes id: Int, vararg formatArgs: Any): String
// If something goes wrong, returns the resource without arguments
val string = getString(id)
reportIssue(resources = this, id, *formatArgs)
reportIssue(it, resources = this, id, *formatArgs)
string
}
@ -61,19 +61,20 @@ fun Resources.getPluralStringSafe(@PluralsRes id: Int, count: Int, vararg format
private fun Result<String>.getOrResourceName(resources: Resources, id: Int, vararg formatArgs: Any): String {
return getOrElse {
reportIssue(resources, id, formatArgs)
reportIssue(it, resources, id, formatArgs)
// If something still goes wrong, returns the resource name
resources.getResourceEntryName(id)
}
}
private fun reportIssue(resources: Resources, id: Int, vararg formatArgs: Any) {
private fun reportIssue(throwable: Throwable, resources: Resources, id: Int, vararg formatArgs: Any) {
val exception = IllegalStateException(
"An error occurred while parsing the string:\n" +
"\tname: R.string.${resources.getResourceEntryName(id)}\n" +
"\targs: ${formatArgs.joinToString(prefix = "[", postfix = "]") { it.toString() }}\n" +
"\tlocale: ${SupportedLanguages.getCurrentSupportedLanguageCode()}\n",
"\tlocale: ${SupportedLanguages.getCurrentSupportedLanguageCode()}\n" +
"\terror message: ${throwable.message.orEmpty()}\n",
)
Timber.tag("Resources").e(exception)

3
core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
View file

@ -17,7 +17,8 @@ const val DECIMAL_SEPARATOR_LIMIT = 1
@Composable
fun rememberDecimalFormat(): DecimalFormat {
val locale = LocalConfiguration.current.locale
val locales = LocalConfiguration.current.locales
val locale = if (locales.isEmpty) Locale.getDefault() else locales[0]
val decimalSymbols = remember { DecimalFormatSymbols.getInstance(locale) }
return remember {