Fix #3035 (Calc does not work with pin numbers starting with 0)

AndBible · Nov 16, 2023 · e027747 · e027747
1 parent a6e6794
commit e027747
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/src/main/java/net/bible/android/view/activity/discrete/CalculatorActivity.kt b/app/src/main/java/net/bible/android/view/activity/discrete/CalculatorActivity.kt
@@ -28,6 +28,7 @@ import android.widget.Toast
 import net.bible.android.activity.databinding.CalculatorLayoutBinding
 import net.bible.android.view.activity.base.ActivityBase
 import net.bible.service.common.CommonUtils
+import net.bible.service.common.CommonUtils.removeLeadingZeroes
 import net.objecthunter.exp4j.ExpressionBuilder
 import java.lang.Exception
 import java.lang.NumberFormatException
@@ -256,7 +257,8 @@ class CalculatorActivity : ActivityBase() {
     }
 
     private fun calculate(input: String) = calculatorBinding.run {
-        val pin = CommonUtils.realSharedPreferences.getString("calculator_pin", "1234")
+        val pin = removeLeadingZeroes(CommonUtils.realSharedPreferences.getString("calculator_pin", "1234")!!)
+
         if(input == pin || pin == "") {
             Log.i(TAG, "Calculator: PIN OK!")
             setResult(RESULT_OK)

diff --git a/app/src/main/java/net/bible/service/common/CommonUtils.kt b/app/src/main/java/net/bible/service/common/CommonUtils.kt
@@ -1616,6 +1616,16 @@ object CommonUtils : CommonUtilsBase() {
         clipboard.setPrimaryClip(clip)
         ABEventBus.post(ToastEvent(application.getString(toastMessage)))
     }
+
+    private val calcPinRegex = Regex("""^(0+)(\d+)$""")
+
+    fun removeLeadingZeroes(s: String): String {
+        val match = calcPinRegex.matchEntire(s)
+        if(match != null) {
+            return match.groupValues[2]
+        }
+        return s
+    }
 }
 
 const val CALC_NOTIFICATION_CHANNEL = "calc-notifications"