From 22b072aff703054fd3d8c952ae6b965aed80d630 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 9 Feb 2023 12:07:50 +0100 Subject: [PATCH 1/2] Fix su nessun elemento selezionato in DialogChooseArtsFromMtbColrList --- .../UltimiArriviFornitoreFragment.java | 10 ++++++---- .../gest/versamento_merce/VersamentoMerceFragment.java | 6 +++++- .../DialogChooseArtsFromMtbColrList.java | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java index e6c578be..106894eb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java @@ -257,13 +257,15 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl DialogChooseArtsFromMtbColrList .newInstance(scannedMtbColt.getMtbColr(), items -> { + List mtbAarts = new ArrayList<>(); - List mtbAarts = Stream.of(items) - .map(MtbColr::getMtbAart) - .toList(); + if(items != null && !items.isEmpty()) { + mtbAarts = Stream.of(items) + .map(MtbColr::getMtbAart) + .toList(); + } filterItems(mtbAarts); - }, null) .show(requireActivity().getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java index 31ccbca6..ea61c82e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java @@ -171,7 +171,11 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag public void onArtsChooseRequired(List mtbColrList, RunnableArgs> onComplete, Runnable onAbort) { this.requireActivity().runOnUiThread(() -> { DialogChooseArtsFromMtbColrList - .newInstance(mtbColrList, onComplete, onAbort) + .newInstance(mtbColrList, data -> { + if(data == null || data.isEmpty()) { + onAbort.run(); + } else onComplete.run(data); + }, onAbort) .show(requireActivity().getSupportFragmentManager(), "tag"); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java index c85678c8..7b2dfd77 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java @@ -122,10 +122,10 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen .map(DialogChooseArtsFromMtbColrListItemModel::getMtbColr) .toList(); - if (selectedArts.isEmpty()) { - if (this.onAbort != null) this.onAbort.run(); - return; - } +// if (selectedArts.isEmpty()) { +// if (this.onAbort != null) this.onAbort.run(); +// return; +// } if (this.onConfirmed != null) this.onConfirmed.run(selectedArts); From bef5423a06178e6bbdffc27a6011840647125f85 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 9 Feb 2023 12:08:28 +0100 Subject: [PATCH 2/2] -> v1.30.12 (330) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 160cfbfc..d1c4e6e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 329 - def appVersionName = '1.30.11' + def appVersionCode = 3330 + def appVersionName = '1.30.12' signingConfigs { release {