From 6bd4870bbb63e50387be6ea6ec4a489fa4d0982f Mon Sep 17 00:00:00 2001 From: Moshe W Date: Sun, 5 Jan 2025 19:17:24 +0200 Subject: [PATCH] Expression error messages. --- .../android/ui/util/widget/CalculatorEditText.java | 4 ++-- .../java/org/gnucash/android/util/AmountParser.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java b/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java index 9854e226b..b738473a8 100644 --- a/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java +++ b/app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java @@ -248,13 +248,13 @@ public String evaluate() { money.getNumerator(); } catch (ArithmeticException e) { setError(getContext().getString(R.string.label_error_invalid_expression)); - Timber.w(e, "Invalid expression: %s", amountString); + Timber.w(e, "Invalid amount: %s", amountString); return ""; } setValue(amount); } else { setError(getContext().getString(R.string.label_error_invalid_expression)); - Timber.w("Invalid expression: %s", amountString); + Timber.w("Invalid amount: %s", amountString); } return getText().toString(); } diff --git a/app/src/main/java/org/gnucash/android/util/AmountParser.java b/app/src/main/java/org/gnucash/android/util/AmountParser.java index 0c0872413..35c3484c2 100644 --- a/app/src/main/java/org/gnucash/android/util/AmountParser.java +++ b/app/src/main/java/org/gnucash/android/util/AmountParser.java @@ -50,10 +50,10 @@ public static BigDecimal evaluate(@Nullable String expressionString) { if (TextUtils.isEmpty(expressionString)) { return null; } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - return evaluate16(expressionString); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + return evaluate26(expressionString); } - return evaluate26(expressionString); + return evaluate16(expressionString); } @Nullable @@ -66,7 +66,7 @@ private static BigDecimal evaluate16(@NonNull String expressionString) { return new BigDecimal(expression.evaluate()); } } catch (Exception e) { - Timber.w(e, "Invalid amount: %s", expressionString); + Timber.w(e, "Invalid expression: %s", expressionString); } return null; } @@ -81,7 +81,7 @@ private static BigDecimal evaluate26(@NonNull String expressionString) { return value.getNumberValue(); } } catch (Exception e) { - Timber.w(e, "Invalid amount: %s", expressionString); + Timber.w(e, "Invalid expression: %s", expressionString); } return null; }