From b662929c1982d3e29769710d13481915dbb0e91a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 29 Jul 2022 19:40:24 +0200 Subject: [PATCH] fix timeout connessioni. fix pre destroy rettifica giacenze. --- .../it/integry/integrywmsnative/core/rest/RESTBuilder.java | 4 ++-- .../gest/rettifica_giacenze/RettificaGiacenzeFragment.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java index ecb8308a..f367c89a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java @@ -28,11 +28,11 @@ public class RESTBuilder { } public static T getService(final Class service, String host, int port, boolean addInterceptors) { - return getService(service, host, port, addInterceptors, true, 30); + return getService(service, host, port, addInterceptors, true, 60); } public static T getService(final Class service, String host, int port, boolean addInterceptors, boolean addEmsApi) { - return getService(service, host, port, addInterceptors, addEmsApi, 30); + return getService(service, host, port, addInterceptors, addEmsApi, 60); } public static T getService(final Class service, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index b1b7d6bc..01a16e85 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -336,14 +336,13 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onError(Exception ex) { this.onLoadingEnded(); + BarcodeManager.enable(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); } else { UtilityExceptions.defaultException(requireActivity(), ex, mCurrentProgress); } - - BarcodeManager.enable(); } @Override @@ -494,7 +493,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onPreDestroy(Runnable onComplete) { - BarcodeManager.removeCallback(barcodeScannerIstanceID); +// BarcodeManager.removeCallback(barcodeScannerIstanceID); mViewModel.closeLU(false); } }