lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Catch ArithmeticException

Browse Source 
Close #1034
This commit is contained in:
MM20 2024-08-15 17:16:12 +02:00
parent cae8fc2cd9
commit 5732080886
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/calculator/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt
View File

@ -54,14 +54,18 @@ class CalculatorRepositoryImpl(
else -> { else -> {
withContext(Dispatchers.Default) { withContext(Dispatchers.Default) {
val exp = Expression(query) try {
if (exp.checkSyntax()) { val exp = Expression(query)
Calculator(term = query, solution = exp.calculate()) if (exp.checkSyntax()) {
} else { Calculator(term = query, solution = exp.calculate())
val exp2 = Expression(query.replace(',', '.').replace(';', ',')) } else {
if (exp2.checkSyntax()) { val exp2 = Expression(query.replace(',', '.').replace(';', ','))
Calculator(term = query, solution = exp2.calculate()) if (exp2.checkSyntax()) {
} else null Calculator(term = query, solution = exp2.calculate())
} else null
}
} catch (e: ArithmeticException) {
null
} }
} }
} }