Fix amount parsing

Ivy-Apps · Apr 17, 2023 · a9b3e7b · a9b3e7b
1 parent eb4f3fc
commit a9b3e7b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/csv/domain/ParseFields.kt b/app/src/main/java/com/ivy/wallet/ui/csv/domain/ParseFields.kt
@@ -37,14 +37,19 @@ private fun parsePositiveDouble(string: String): Double? {
     val cleanedString = string
         .replace("-", "")
         .replace(" ", ".")
+        .filter { it.isDigit() || it == '.' }
     val numberFormat = NumberFormat.getInstance(Locale.getDefault())
-    return if (numberFormat is DecimalFormat) {
-        numberFormat.applyPattern("#,###.##")
-        val parsedNumber = numberFormat.parse(cleanedString)
-        parsedNumber?.toDouble()
-    } else {
-        string.toDoubleOrNull()
+    if (numberFormat is DecimalFormat) {
+        try {
+            numberFormat.applyPattern("#,###.##")
+            val parsedNumber = numberFormat.parse(cleanedString)?.toDouble()
+            if (parsedNumber != null) return parsedNumber
+        } catch (e: Exception) {
+            // ignored
+        }
     }
+
+    return cleanedString.toDoubleOrNull() ?: string.toDoubleOrNull()
 }
 
 // endregion