From 879cfc5f7eaaaea48961143d7efa23a5b8f72e66 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 25 Mar 2024 12:45:21 +0100
Subject: [PATCH] Fix vari

---
 .../it/integry/integrywmsnative/core/di/Converters.java  | 9 ++++++---
 .../integrywmsnative/core/utility/UtilityString.java     | 4 ++--
 .../edit_form/DocInterniEditFormViewModel.java           | 7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index 947c6cc5..fd8ddc73 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -238,8 +238,11 @@ public class Converters {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
-                    if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                    String newValueString = s.toString().trim();
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
                     observableBigDecimal.set(value);
                 }
             };
@@ -247,7 +250,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
index 53e7ceb2..629bfabc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
 public class UtilityString {
 
     public static boolean isNullOrEmpty(String stringToCheck){
-        return stringToCheck == null || stringToCheck.trim().length() == 0;
+        return stringToCheck == null || stringToCheck.trim().isEmpty();
     }
 
     public static String isNull(String stringToCheck, String alternativeString){
@@ -23,7 +23,7 @@ public class UtilityString {
     }
 
     public static String empty2null(String stringToCheck) {
-        return (stringToCheck == null || stringToCheck.trim().length() == 0) ? null : stringToCheck.trim();
+        return (stringToCheck == null || stringToCheck.trim().isEmpty()) ? null : stringToCheck.trim();
     }
 
     public static String capitalizeWords(String capString){
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 2b55bb45..6e3cb997 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -125,7 +125,12 @@ public class DocInterniEditFormViewModel {
     }
 
     public void loadArticoloByCodMartOrBarcode(String codMart) {
-        var matchedArt = Stream.of(productsList)
+        if(productsList == null) {
+            this.sendError(new NoResultFromCodMartException(codMart));
+            return;
+        }
+
+        var matchedArt = productsList.stream()
                 .filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
                         x.getBarcode().contains(codMart))
                 .findFirst()