diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java index c3528ef6..be45bc01 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java @@ -196,7 +196,6 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi @Override public void onItemDispatched(ArticoloOrdine articoloOrdine) { - BarcodeManager.disable(); DialogEditArticoloView .newInstance(articoloOrdine, articolo -> { runOnUiThread(() -> { @@ -205,7 +204,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi } this.mViewModel.refreshListArticoli(); }); - }, null).show(this.getSupportFragmentManager(), "tag"); + }, null).show(this.getSupportFragmentManager(), "DialogEditArticoloView"); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java index 00891c61..32cd8e09 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java @@ -15,7 +15,6 @@ import javax.inject.Inject; import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine; -import it.integry.integrywmsnative.core.data_store.db.entity.Griglia; import it.integry.integrywmsnative.core.data_store.db.entity.Ordine; import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository; import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository; @@ -121,14 +120,6 @@ public class PVOrdineAcquistoEditViewModel { ); } - private void loadGriglia(int idGriglia, RunnableArgs onLoad) { - try { - mGrigliaRepository.findGrigliaById(idGriglia, onLoad, this::sendError); - } catch (Exception e) { - this.sendError(e); - } - } - private void loadArticoli(Ordine ordine, RunnableArgs> onLoad) { try { mArticoliOrdineRepository.findArticoliByOrdine(ordine, onLoad, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloView.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloView.java index 9d87e64f..ea96cd2a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloView.java @@ -115,6 +115,7 @@ public class DialogEditArticoloView extends BaseDialogFragment implements Dialog if (this.mOnAbort != null) { this.mOnAbort.run(); } + BarcodeManager.removeCallback(barcodeScannerIstanceID); super.onDismiss(dialog); }