From ab6eeb91a6d1ed8662ddad75d39352fd452a1948 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Tue, 28 Mar 2023 19:29:52 +0200
Subject: [PATCH] [Documenti interni] gestito annullamento selezione righe da
 modificare

---
 .../DialogSelectDocRowsView.java              | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsView.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsView.java
index afe801ea..2024e6e3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsView.java
@@ -26,7 +26,9 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.databinding.DialogSelectDocRowsBinding;
 import it.integry.integrywmsnative.databinding.DialogSelectDocRowsItemModelBinding;
 
-/** @noinspection rawtypes*/
+/**
+ * @noinspection rawtypes
+ */
 public class DialogSelectDocRowsView extends BaseDialogFragment {
 
 
@@ -76,8 +78,16 @@ public class DialogSelectDocRowsView extends BaseDialogFragment {
         var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
                 .setView(mBindings.getRoot())
                 .setCancelable(isCancelable())
-                .setPositiveButton(R.string.confirm, null)
-                .setNegativeButton(R.string.abort, null)
+                .setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    final DialogSelectDocRowsItemListModel<Object> selectedItem = Stream.of(listArts)
+                            .filter(x -> x.getChecked().get())
+                            .findFirstOrElse(null);
+                    if (selectedItem != null)
+                        this.onConfirm.run(selectedItem);
+                })
+                .setNegativeButton(R.string.abort, (dialog, which) -> {
+                    if (this.onAbort != null) this.onAbort.run();
+                })
                 .create();
 
         alertDialog.setCanceledOnTouchOutside(isCancelable());
@@ -93,19 +103,6 @@ public class DialogSelectDocRowsView extends BaseDialogFragment {
         this.initRecyclerView();
     }
 
-    @Override
-    public void onDismiss(@NonNull DialogInterface dialog) {
-        super.onDismiss(dialog);
-
-        final DialogSelectDocRowsItemListModel<Object> selectedItem = Stream.of(listArts)
-                .filter(x -> x.getChecked().get())
-                .findFirstOrElse(null);
-
-        if(selectedItem != null)
-            this.onConfirm.run(selectedItem);
-        else this.onAbort.run();
-    }
-
     private void initRecyclerView() {
         var itemType = new Type<DialogSelectDocRowsItemListModel, DialogSelectDocRowsItemModelBinding>(R.layout.dialog_select_doc_rows__item_model, BR.row);
 //        itemType.areItemSame((oldItem, newItem) -> Objects.equals(oldItem.getId(), newItem.getId()));
@@ -121,7 +118,7 @@ public class DialogSelectDocRowsView extends BaseDialogFragment {
                 .map(DialogSelectDocRowsItemListModel.class, itemType)
                 .into(this.mBindings.itemList);
     }
-    
+
     private void resetChecks() {
         for (var item : listArts) {
             item.getChecked().set(false);