From a2d165d47523bce5e41bd15622ed1a99a5d43b82 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 9 Mar 2022 10:33:09 +0100 Subject: [PATCH] Rimosso caricamento profili allo start. Aggiunto ulteriore controllo su licenza --- .../core/exception/NotValidLicenseException.java | 8 ++++++++ .../core/rest/consumers/_BaseRESTConsumer.java | 5 ++++- .../integrywmsnative/core/settings/SettingsManager.java | 6 +++--- .../integrywmsnative/core/utility/UtilityServer.java | 3 ++- .../gest/login/viewmodel/LoginViewModel.java | 2 -- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java new file mode 100644 index 00000000..ea39bc23 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java @@ -0,0 +1,8 @@ +package it.integry.integrywmsnative.core.exception; + +public class NotValidLicenseException extends Exception { + + public NotValidLicenseException() { + super("Licenza non valida"); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java index 8d8c0d8f..07250691 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java @@ -5,6 +5,7 @@ import android.util.Log; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.core.exception.NotValidLicenseException; import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.rest.model.EsitoType; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; @@ -41,7 +42,9 @@ public class _BaseRESTConsumer { if (response.code() == 404) { Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url().toString() + ")"); onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")")); - } else { + } else if (response.code() == 550) + onFailed.run(new NotValidLicenseException()); + else { Log.e(logTitle, "Status " + response.code() + ": " + response.message()); onFailed.run(new Exception("Status " + response.code() + ": " + response.message())); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 1613d2f3..4804b7d4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -91,8 +91,8 @@ public class SettingsManager { onProgress.run("dati azienda"); loadDatiAzienda(() -> { - onProgress.run("profili"); - loadAvailableProfiles(() -> { +// onProgress.run("profili"); +// loadAvailableProfiles(() -> { onProgress.run("depositi"); loadAvailableCodMdeps(() -> { @@ -104,7 +104,7 @@ public class SettingsManager { loadGestSetupValues(tmpOnComplete, tmpOnFailed); }, tmpOnFailed); }, tmpOnFailed); - }, tmpOnFailed); +// }, tmpOnFailed); }, tmpOnFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java index f33d3c58..ea06a59e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java @@ -5,6 +5,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketAddress; +import it.integry.integrywmsnative.core.exception.NotValidLicenseException; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.gest.login.exception.ServerNotReachableException; import okhttp3.OkHttpClient; @@ -53,7 +54,7 @@ public class UtilityServer { else if (response.code() == 404) onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, null)); else if (response.code() == 550) - onFailed.run(new Exception("Licenza non valida")); + onFailed.run(new NotValidLicenseException()); else onFailed.run(new Exception("Errore non identificato (STATUS: " + response.code() + ")")); } catch (IOException e) { onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, e)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 804a9e5d..7771456a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -55,8 +55,6 @@ public class LoginViewModel { mLoginRESTConsumer.authenticate(host, port, username, password, loginDTO -> { - SettingsManager.iDB().setAvailableProfiles(loginDTO.getAvailableProfiles()); - SettingsManager.i().createUserSession(); SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.getFull_name()) ? loginDTO.getFull_name() : username);