diff --git a/app/build.gradle b/app/build.gradle index bcb37f1e..bcd99bb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 506 - def appVersionName = '1.46.18' + def appVersionCode = 507 + def appVersionName = '1.46.19' signingConfigs { release { @@ -51,9 +51,12 @@ android { buildTypes { debug { ext.enableCrashlytics = false +// minifyEnabled true // Abilita la minimizzazione del codice +// shrinkResources true // Rimuove risorse non utilizzate +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { - minifyEnabled true // Abilita la minimizzazione del codice +// minifyEnabled true // Abilita la minimizzazione del codice shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 579e09fa..9c4ec8eb 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -23,3 +23,20 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile +# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, +# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) +-keep class * extends com.google.gson.TypeAdapter +-keep class * implements com.google.gson.TypeAdapterFactory +-keep class * implements com.google.gson.JsonSerializer +-keep class * implements com.google.gson.JsonDeserializer +# Prevent R8 from leaving Data object members always null +-keepclasseswithmembers class * { + (...); + @com.google.gson.annotations.SerializedName ; +} +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +-keep class it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } +-keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java index ea3e4c01..142fd44b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java @@ -1,11 +1,17 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; import java.util.HashMap; public class AuthTokenClaimsDTO { + @SerializedName("deviceId") private long deviceId; + + @SerializedName("userDTO") private User userDTO; + + @SerializedName("profilesData") private HashMap profilesData; public long getDeviceId() { @@ -36,11 +42,22 @@ public class AuthTokenClaimsDTO { } public class User { + @SerializedName("username") private String username; + + @SerializedName("email") private Object email; + + @SerializedName("fullname") private String fullname; + + @SerializedName("keyGroup") private int keyGroup; + + @SerializedName("attivo") private boolean attivo; + + @SerializedName("type") private String type; public String getUsername() { @@ -99,6 +116,7 @@ public class AuthTokenClaimsDTO { } public static class AuthTokenProfileDetails { + @SerializedName("defaultDepo") private AuthTokenDepoDetails defaultDepo; public AuthTokenDepoDetails getDefaultDepo() { @@ -112,8 +130,13 @@ public class AuthTokenClaimsDTO { } public static class AuthTokenDepoDetails { + @SerializedName("codMdep") private String codMdep; + + @SerializedName("descrizione") private String descrizione; + + @SerializedName("codJfas") private String codJfas; public String getCodMdep() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java index f51af87e..404259b0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java @@ -1,12 +1,20 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; import java.time.LocalDateTime; public class AuthenticationJwtResponseDTO { + @SerializedName("accessToken") private String accessToken; + + @SerializedName("refreshToken") private String refreshToken; + + @SerializedName("expiryDate") private LocalDateTime expiryDate; + + @SerializedName("expireIn") private long expireIn; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java index 062c0aae..9afdf740 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java @@ -1,11 +1,22 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class LoginAziendaDTO { + @SerializedName("profileDb") private String profileDb; + + @SerializedName("endpointRestApi") private String endpointRestApi; + + @SerializedName("phpApi") private String phpApi; + + @SerializedName("repoPhoto") private String repoPhoto; + + @SerializedName("endpointPvm") private String endpointPvm; public String getProfileDb() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java index d124cce2..19249849 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java @@ -1,9 +1,16 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class LoginRequestDTO { + @SerializedName("username") private String username; + + @SerializedName("password") private String password; + + @SerializedName("deviceId") private String deviceId; public String getUsername() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java index c8dae711..10bd7480 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java @@ -1,12 +1,15 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; import java.util.List; public class LoginResponseDTO { + @SerializedName("fullName") private String fullName; - private List availableProfiles; + @SerializedName("availableProfiles") + private List availableProfiles; public String getFullName() { return fullName; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java index 49958f69..230849ff 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java @@ -1,6 +1,9 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class RefreshRequestDTO { + @SerializedName("refreshToken") private String refreshToken; public String getRefreshToken() { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java index aca61953..f0dd7b88 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java @@ -2,14 +2,23 @@ package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi; import androidx.databinding.ObservableBoolean; import androidx.databinding.ObservableField; +import com.google.gson.annotations.SerializedName; public class TracciamentoImballoDTO { + @SerializedName("codTcol") private final ObservableField codTcol = new ObservableField<>(); + + @SerializedName("descrizione") private final ObservableField descrizione = new ObservableField<>(); + + @SerializedName("codMart") private final ObservableField codMart = new ObservableField<>(); + + @SerializedName("qta") private final ObservableField qta = new ObservableField<>(); + @SerializedName("editable") private final ObservableBoolean editable = new ObservableBoolean(true); public ObservableField getCodTcol() {