From 63e4e4e791adc087c410fb615cc9900a303eb724 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 5 May 2022 16:09:48 +0200 Subject: [PATCH 1/2] aggiunto controllo su aggiunta articoli extra senza collo --- .../view/dialogs/scan_art/DialogScanArtView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java index 1dcfaf2b..f62f9a16 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java @@ -110,7 +110,7 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA var filteredMtbColrList = mtbColrList; - if (mtbAart != null) { + if (mtbAart != null && filteredMtbColrList != null) { filteredMtbColrList = Stream.of(filteredMtbColrList) .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart())) .toList(); From 7d263699da29a9f6afe514b7139de8e07055a794 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 5 May 2022 16:11:27 +0200 Subject: [PATCH 2/2] -> v1.26.1 (284) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 297c3a8f..ae687d62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 283 - def appVersionName = '1.26.0' + def appVersionCode = 284 + def appVersionName = '1.26.1' signingConfigs { release {