From 95fc68082391c6ea67b01db1aff506e47e3f910d Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 5 Oct 2022 14:11:11 +0200 Subject: [PATCH 1/2] aggiunti controlli su lista ordini accettazione nulla --- .../ProdOrdineProduzioneElencoFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index ec6fbf2c..4bf063de 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -291,9 +292,10 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements } else { tmpList = mViewModel.getOrderList().getValue(); } - this.mOrdiniInevasiMutableData.clear(); - this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(tmpList)); + if (tmpList != null) { + this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(tmpList)); + } } private List convertDataModelToListModel(List dataList) { @@ -384,6 +386,11 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements private void initJtbComtCache(Runnable onComplete) { + if (this.mViewModel.getOrderList().getValue() == null) { + this.jtbComtCache = new ArrayList<>(); + onComplete.run(); + return; + } var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrderList().getValue())) .flatMap(x -> Stream.of(x.getCodJcom())) .toList(); From 5e147c9d965b56ac5492a4a95077460a9b16cd1d Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 5 Oct 2022 14:11:52 +0200 Subject: [PATCH 2/2] -> v1.29.6 (310) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e9a55006..246014bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 309 - def appVersionName = '1.29.5' + def appVersionCode = 310 + def appVersionName = '1.29.6' signingConfigs { release {