From 0aa0b09afa28729c77ee8d61261de90fe31403f4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 09:47:11 +0200 Subject: [PATCH 01/11] Fix su null della variabile Server in Login --- Jenkinsfile.groovy | 1 + .../core/settings/SettingsManager.java | 14 ++++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 51b09c0b..ac46081c 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -30,6 +30,7 @@ pipeline { stage('Build') { steps { bat "./gradlew assembleRelease" + bat "./gradlew app:uploadCrashlyticsSymbolFileRelease" archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true } } 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 2b10e613..7243e9a9 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 @@ -39,8 +39,6 @@ public class SettingsManager { private static SettingsModel settingsModelIstance; private static DBSettingsModel dbSettingsModelIstance; - private static boolean firstStart = false; - private static Context mContext; private static SystemRESTConsumer mSystemRESTConsumer; private static ImballiRESTConsumer mImballiRESTConsumer; @@ -65,15 +63,15 @@ public class SettingsManager { public void init() { settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class); - if (settingsModelIstance == null) { + if (settingsModelIstance == null) settingsModelIstance = new SettingsModel(); + + if (settingsModelIstance.getServer() == null) settingsModelIstance.setServer(new SettingsModel.Server()); - firstStart = true; - } + dbSettingsModelIstance = new DBSettingsModel(); - } public SettingsModel getSettings() { @@ -89,10 +87,6 @@ public class SettingsManager { return dbSettingsModelIstance; } - public static boolean isFirstStart() { - return firstStart; - } - public static boolean isInstanceAvailable() { return i() != null; } From fc2c0fbe0c3a2c18626430e4f4d4a5c314873e9e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 10:26:15 +0200 Subject: [PATCH 02/11] -> v1.47.11 (524) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 219e0fbf..a2fa41a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 523 - def appVersionName = '1.47.10' + def appVersionCode = 524 + def appVersionName = '1.47.11' signingConfigs { release { From 2cb184f24b406f4fa1d1c6b4e9a789364f2bb91e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 10:35:40 +0200 Subject: [PATCH 03/11] Aggiunto upload simboli su Firebase --- app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index a2fa41a8..df975f88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.google.firebase.crashlytics' //apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' + android { def appVersionCode = 524 @@ -60,6 +61,9 @@ android { shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release + firebaseCrashlytics { + mappingFileUploadEnabled false + } } } From bc67098ae07de3e51f0dd8138f0bece7e7fa565b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 10:36:33 +0200 Subject: [PATCH 04/11] Aggiunto upload simboli su Firebase --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index df975f88..db88020a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release firebaseCrashlytics { - mappingFileUploadEnabled false + mappingFileUploadEnabled true } } } From 8772d11e022de5c37fc2c2683c14357451af9d90 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 10:37:36 +0200 Subject: [PATCH 05/11] Aggiunto upload simboli su Firebase --- Jenkinsfile.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index ac46081c..51b09c0b 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -30,7 +30,6 @@ pipeline { stage('Build') { steps { bat "./gradlew assembleRelease" - bat "./gradlew app:uploadCrashlyticsSymbolFileRelease" archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true } } From 007d58a17e0d8a2c000fa88fc9b355f3c10d257a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:00:48 +0200 Subject: [PATCH 06/11] Aggiunta esclusione classi JJWT dall'obfuscation --- app/proguard-rules.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9c4ec8eb..46daa1b6 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -34,6 +34,11 @@ (...); @com.google.gson.annotations.SerializedName ; } + +# Per JJWT +-keep class io.jsonwebtoken.** { *; } +-keepnames class io.jsonwebtoken.* { *; } + # 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 From 3a43e9238bfb5f8a2b6abb4ba3b2b75110c969e7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:00:48 +0200 Subject: [PATCH 07/11] Aggiunta esclusione classi JJWT dall'obfuscation --- app/proguard-rules.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9c4ec8eb..97f6bd08 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -34,6 +34,12 @@ (...); @com.google.gson.annotations.SerializedName ; } + +# Per JJWT +-keep class io.jsonwebtoken.** { *; } +-keepnames class io.jsonwebtoken.* { *; } +-keepnames interface io.jsonwebtoken.* { *; } + # 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 From ee1042704896a9ef508797b6a16e7db2170245ee Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:03:45 +0200 Subject: [PATCH 08/11] -> v1.47.12 (525) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index db88020a..d461eed5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 524 - def appVersionName = '1.47.11' + def appVersionCode = 525 + def appVersionName = '1.47.12' signingConfigs { release { From 72edf5228ad453af1cd933a687f18bfacd4c1055 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:24:11 +0200 Subject: [PATCH 09/11] Rimosso minify --- app/build.gradle | 8 ++++---- .../core/rest/model/AvailableCodMdepsDTO.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d461eed5..940db228 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,13 +52,13 @@ android { buildTypes { debug { ext.enableCrashlytics = false -// minifyEnabled true // Abilita la minimizzazione del codice -// shrinkResources true // Rimuove risorse non utilizzate + 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 - shrinkResources true // Rimuove risorse non utilizzate +// minifyEnabled true // Abilita la minimizzazione del codice +// shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release firebaseCrashlytics { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java index e26407cd..34de9e8e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java @@ -1,8 +1,13 @@ package it.integry.integrywmsnative.core.rest.model; +import com.google.gson.annotations.SerializedName; + public class AvailableCodMdepsDTO { + @SerializedName("codMdep") private String codMdep; + + @SerializedName("descrizione") private String descrizione; public String getCodMdep() { From 150be3cae2095d68db82e37672554348b8a78923 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:24:11 +0200 Subject: [PATCH 10/11] Rimosso minify --- app/build.gradle | 6 +++--- .../core/rest/model/AvailableCodMdepsDTO.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d461eed5..66696528 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,11 +54,11 @@ android { ext.enableCrashlytics = false // minifyEnabled true // Abilita la minimizzazione del codice // shrinkResources true // Rimuove risorse non utilizzate - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { - minifyEnabled true // Abilita la minimizzazione del codice - shrinkResources true // Rimuove risorse non utilizzate +// minifyEnabled true // Abilita la minimizzazione del codice +// shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release firebaseCrashlytics { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java index e26407cd..34de9e8e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java @@ -1,8 +1,13 @@ package it.integry.integrywmsnative.core.rest.model; +import com.google.gson.annotations.SerializedName; + public class AvailableCodMdepsDTO { + @SerializedName("codMdep") private String codMdep; + + @SerializedName("descrizione") private String descrizione; public String getCodMdep() { From ac4500e2a2aa46fd936d96f26bc99d66e4ff758c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Sep 2025 11:25:26 +0200 Subject: [PATCH 11/11] -> v1.47.13 (526) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 66696528..6f720ec3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 525 - def appVersionName = '1.47.12' + def appVersionCode = 526 + def appVersionName = '1.47.13' signingConfigs { release {