From 2f46e77ba31043d89d053efa062971d041f2cfa6 Mon Sep 17 00:00:00 2001 From: AlbertoPellitteri Date: Wed, 12 May 2021 09:32:29 +0200 Subject: [PATCH 1/4] Add of a simple check in order to fix the division-by-zero bug --- .../simplemobiletools/calculator/helpers/CalculatorImpl.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 70c9b8fa..d4e42d07 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -147,6 +147,10 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { secondValue = getSecondValue() calculateResult() + if (lastOperation == DIVIDE && secondValue == 0.0){ + lastKey = DIGIT + return + } lastKey = EQUALS } From 2f9c04575464a2275fb14d6a4592286d6df65a82 Mon Sep 17 00:00:00 2001 From: AlbertoPellitteri Date: Wed, 12 May 2021 09:39:54 +0200 Subject: [PATCH 2/4] Small indentation typo in my fix --- .../com/simplemobiletools/calculator/helpers/CalculatorImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d4e42d07..b0462437 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -147,7 +147,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { secondValue = getSecondValue() calculateResult() - if (lastOperation == DIVIDE && secondValue == 0.0){ + if (lastOperation == DIVIDE && secondValue == 0.0) { lastKey = DIGIT return } From 832487fbe6ffbf4e4f1bc73fb6d03fc5eb50f70b Mon Sep 17 00:00:00 2001 From: AlbertoPellitteri Date: Mon, 24 May 2021 10:43:48 +0200 Subject: [PATCH 3/4] This commit takes care also of the percent operator --- .../com/simplemobiletools/calculator/helpers/CalculatorImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b0462437..453cd8bf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -147,7 +147,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { secondValue = getSecondValue() calculateResult() - if (lastOperation == DIVIDE && secondValue == 0.0) { + if ( (lastOperation == DIVIDE || lastOperation == PERCENT) && secondValue == 0.0) { lastKey = DIGIT return } From 70cb8faa9414a6ee41e62c0f8bf414f9b0c9e5b2 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Wed, 3 Nov 2021 22:52:22 +0100 Subject: [PATCH 4/4] some spacing corrections --- .../com/simplemobiletools/calculator/helpers/CalculatorImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 453cd8bf..69783e62 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -147,10 +147,11 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { secondValue = getSecondValue() calculateResult() - if ( (lastOperation == DIVIDE || lastOperation == PERCENT) && secondValue == 0.0) { + if ((lastOperation == DIVIDE || lastOperation == PERCENT) && secondValue == 0.0) { lastKey = DIGIT return } + lastKey = EQUALS }