diff --git a/app/build.gradle b/app/build.gradle index 09b3a3ea..35776517 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.15' + implementation 'com.simplemobiletools:commons:5.33.17' implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index 6d567c8c..2dd782a9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -175,6 +175,11 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { } val result = ExpressionBuilder(expression.replace(",", "")).build().evaluate() + if (result.isInfinite()) { + context.toast(R.string.unknown_error_occurred) + return + } + showNewResult(result.format()) baseValue = result inputDisplayedFormula = result.format() diff --git a/build.gradle b/build.gradle index b604e4eb..c5d876f4 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong