diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java index 60a694e3..3edb1a81 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java @@ -3,10 +3,9 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dialog; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.annimon.stream.Stream; - import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.DocumentRequiredException; @@ -34,24 +33,11 @@ public class DialogSelectDocInfoViewModel extends ViewModel { private final MutableLiveData noteRequired = new MutableLiveData<>(false); public DialogSelectDocInfoViewModel() { - tipoDoc.observeForever(val -> - fornitoreRequired.postValue( - val != null && - (val.getGestioneDoc().equals("T") || - val.getGestioneDoc().equals("A") || - (val.getGestioneDoc().equals("P") && - !val.getGestione().equals("L"))))); + tipoDoc.observeForever(val -> fornitoreRequired.postValue(val != null && (val.getGestioneDoc().equals("T") || val.getGestioneDoc().equals("A") || (val.getGestioneDoc().equals("P") && !val.getGestione().equals("L"))))); - tipoDoc.observeForever(val -> - documentRequired.postValue( - val != null && - val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L"))); + tipoDoc.observeForever(val -> documentRequired.postValue(val != null && val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L"))); - tipoDoc.observeForever(val -> - noteRequired.postValue( - val != null && - val.getGestioneDoc().equals("P") && - val.getGestione().equals("L"))); + tipoDoc.observeForever(val -> noteRequired.postValue(val != null && val.getGestioneDoc().equals("P") && val.getGestione().equals("L"))); } public MutableLiveData> getAvailableFornitori() { @@ -60,18 +46,15 @@ public class DialogSelectDocInfoViewModel extends ViewModel { public void setFornitori(List fornitori) { tipoDoc.observeForever(val -> { - availableFornitori.postValue(Stream.of(fornitori) - .filter(forn -> { - if (val.getGestioneDoc().equalsIgnoreCase("T")) { - return forn.getTipoAnag().equalsIgnoreCase("D") && - forn.getGestioneAnag().equalsIgnoreCase( - val.getGestione().equalsIgnoreCase("V") ? "V" : "L" - ); - } else { - return forn.getTipoAnag().equalsIgnoreCase("F"); - } - }) - .toList()); + List availableFornitoriList = fornitori.stream().filter(forn -> { + if (val.getGestioneDoc().equalsIgnoreCase("T")) { + return forn.getTipoAnag().equalsIgnoreCase("D") && forn.getGestioneAnag().equalsIgnoreCase(val.getGestione().equalsIgnoreCase("V") ? "V" : "L"); + } else { + return forn.getTipoAnag().equalsIgnoreCase("F"); + } + }).collect(Collectors.toList()); + + availableFornitori.postValue(availableFornitoriList); }); }