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 e43d30c1..2fc0b9b3 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 @@ -18,18 +18,21 @@ public class RESTBuilder { return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true); } - public static T getService(final Class service, long timeout) { + public static T getService(final Class service, int timeout) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true); + return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, timeout); } + public static T getService(final Class service, String host, int port, boolean addInterceptors) { + return getService(service, host, port, addInterceptors, 30); + } - public static T getService(final Class service, String host, int port, boolean addInterceptors){ + public static T getService(final Class service, String host, int port, boolean addInterceptors, int timeout){ OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); - clientBuilder.connectTimeout(30, TimeUnit.SECONDS); - clientBuilder.readTimeout(30, TimeUnit.SECONDS); - clientBuilder.writeTimeout(30, TimeUnit.SECONDS); + clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS); + clientBuilder.readTimeout(timeout, TimeUnit.SECONDS); + clientBuilder.writeTimeout(timeout, TimeUnit.SECONDS); if(addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index 4e4a42b7..9a4c5c93 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -93,7 +93,7 @@ public class VenditaHelper { String joinedBarcodes = TextUtils.join(",", barcodeOrdini); - OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class); + OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 60); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_v"); perfTrace.start();