From fa10973626f93eee663a69f13e4e8487a14b4170 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 21 Feb 2025 11:55:45 +0100
Subject: [PATCH 1/3] Migliorata gestione status code nel caso di
 UnauthorizedAccess nell'interceptor

---
 .../core/rest/AuthInterceptor.java                 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
index 4014cbf2..9ae9fe08 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
@@ -6,11 +6,14 @@ import java.io.IOException;
 
 import io.jsonwebtoken.Claims;
 import it.integry.integrywmsnative.core.authentication.JwtUtils;
+import it.integry.integrywmsnative.core.exception.UnauthorizedAccessException;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer;
 import okhttp3.Interceptor;
+import okhttp3.Protocol;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class AuthInterceptor implements Interceptor {
 
@@ -30,7 +33,7 @@ public class AuthInterceptor implements Interceptor {
             var accessToken = SettingsManager.i().getUserSession().getAccessToken();
             var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
 
-            if (accessToken != null && (accessTokenExpiryDate == null || UtilityDate.getNowTime().isAfter(accessTokenExpiryDate))) {
+            if (accessToken != null && (accessTokenExpiryDate == null || UtilityDate.getNowTime().isAfter(accessTokenExpiryDate.minusSeconds(20)))) {
 
                 // Make the token refresh request
                 try {
@@ -45,6 +48,15 @@ public class AuthInterceptor implements Interceptor {
                             .setRefreshTokenExpiryDate(response.getExpiryDate());
 
                     SettingsManager.update();
+                } catch (UnauthorizedAccessException uae) {
+                    // Crea una risposta 401 manualmente
+                    return new Response.Builder()
+                            .request(originalRequest)
+                            .protocol(Protocol.HTTP_1_1)
+                            .code(401)
+                            .message("Unauthorized")
+                            .body(ResponseBody.create(new byte[0], null))
+                            .build();
                 } catch (Exception e) {
                     return chain.proceed(originalRequest);
                 }

From e24e6858fb71a853ee959fab0408d3f3225a81cf Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 24 Feb 2025 15:30:34 +0100
Subject: [PATCH 2/3] Fix su commessa nulla nel caso di picking libero

---
 .../gest/picking_libero/PickingLiberoViewModel.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 6876aa3c..1c9fb4dc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -552,7 +552,8 @@ public class PickingLiberoViewModel {
                 askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
                     if (!destNewMtbColr.isEmpty()) {
 
-                        destNewMtbColr.forEach(x -> x.setCodJcom(this.mDefaultCommessa.getCodJcom()));
+                        if(this.mDefaultCommessa != null)
+                            destNewMtbColr.forEach(x -> x.setCodJcom(this.mDefaultCommessa.getCodJcom()));
 
                         MtbColt clonedTestata = (MtbColt) sourceMtbColt.clone();
                         clonedTestata.getMtbColr().clear();

From 27edd844426effcd54bd772d396f61bf9784c047 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 24 Feb 2025 15:31:16 +0100
Subject: [PATCH 3/3] -> v1.44.04 (473)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5289fbff..22f67ae6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 472
-    def appVersionName = '1.44.03'
+    def appVersionCode = 473
+    def appVersionName = '1.44.04'
 
     signingConfigs {
         release {