From 83a6dd29f2bc442011a73754b0d46449a93b226e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 25 Mar 2024 10:58:19 +0100 Subject: [PATCH 1/6] Aggiornato AGP --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4f7ed199..125adf3e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.0' - agp_version = '8.3.0' + agp_version = '8.3.1' } repositories { From 879cfc5f7eaaaea48961143d7efa23a5b8f72e66 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 25 Mar 2024 12:45:21 +0100 Subject: [PATCH 2/6] 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() From dd523ed6d84b86cb80c50bca35716e69646412f5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 27 Mar 2024 18:15:11 +0100 Subject: [PATCH 3/6] Rimossa apertura loading popup che causava crash --- .../gest/picking_libero/PickingLiberoViewModel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 48c17530..e7692971 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -529,9 +529,9 @@ public class PickingLiberoViewModel { this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> { List destNewMtbColr = new ArrayList<>(); - if (pickedAarts.size() > 0) { + if (!pickedAarts.isEmpty()) { askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { - if (destNewMtbColr.size() > 0) { + if (!destNewMtbColr.isEmpty()) { MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone(); clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE); @@ -563,8 +563,6 @@ public class PickingLiberoViewModel { clonedTestata.setMtbColr(mtbColrObservableField); - this.sendOnLoadingStarted(); - new Thread(() -> { mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> { for (int i = 0; i < mtbColrObservableField.size(); i++) { From f29f832387f158298b55fdf7c68df3b5777403ca Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 27 Mar 2024 18:16:05 +0100 Subject: [PATCH 4/6] -> v1.40.07 (424) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cfe7e51d..a7111eb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 423 - def appVersionName = '1.40.06' + def appVersionCode = 424 + def appVersionName = '1.40.07' signingConfigs { release { From 76cf6c7d66c6190931a699baa60cc746b5d2271a Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 4 Apr 2024 11:52:24 +0200 Subject: [PATCH 5/6] Fix LocalDate deserializer --- .../core/rest/deserializer/LocalDateDeserializer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java index 5570f9ba..fdd81603 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java @@ -13,15 +13,13 @@ import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityString; public class LocalDateDeserializer implements JsonDeserializer { - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); - - @Override public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException { String date = element.getAsString(); if (UtilityString.isNullOrEmpty(date)) return null; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityString.determineDateFormat(date)); + return LocalDate.parse(date, formatter); } } From 38dc5e134cf193f1eba82e827df047a17f605c2f Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 4 Apr 2024 11:53:56 +0200 Subject: [PATCH 6/6] -> v1.40.08 (425) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a7111eb6..5cb376ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 424 - def appVersionName = '1.40.07' + def appVersionCode = 425 + def appVersionName = '1.40.08' signingConfigs { release {