From 857295d92b4110221081a68f43c24d96341e5e6f Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Wed, 16 Feb 2022 13:00:10 +0100
Subject: [PATCH] corretta conversione date string da query

---
 .../rest/consumers/SystemRESTConsumer.java    | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
index 570bb413..1155243f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
@@ -5,9 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.orhanobut.logger.Logger;
@@ -17,8 +15,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -35,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -55,18 +52,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "ProcessSql", o -> {
                     Gson gson = new GsonBuilder()
-                            .registerTypeAdapter(Date.class, new JsonDeserializer() {
-                                @Override
-                                public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                                    try {
-                                        return new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(json.getAsString());
-                                    } catch (Exception e) {
-                                        try {
-                                            return new SimpleDateFormat().parse(json.getAsString());
-                                        } catch (ParseException parseException) {
-                                            throw new JsonParseException(parseException);
-                                        }
-                                    }
+                            .registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> {
+                                try {
+                                    return UtilityDate.recognizeDate(json.getAsString());
+                                } catch (Exception e) {
+                                    throw new JsonParseException(e);
                                 }
                             })
                             .create();