From 526bc11626831e840d8658593a49bb9d7b881296 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 19 Feb 2025 09:37:09 +0100
Subject: [PATCH 1/3] Fix su gestione rif nulla in bottomsheet

---
 .../res/layout/bottom_sheet_fragment__lu_content__list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index 92c761ba..1e38e785 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -186,7 +186,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{GestioneToTextConverter.convert(mtbColr.gestioneRifEnum)}"
+                        android:text="@{mtbColr.gestioneRifEnum != null ? GestioneToTextConverter.convert(mtbColr.gestioneRifEnum) : &quot;&quot;}"
                         android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                         android:textColor="?attr/colorOutline"
                         tools:text="Lavorazione"/>

From f85f5d63a61c7ace7deb0c975f4d036ef5ec13ba Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 19 Feb 2025 10:09:10 +0100
Subject: [PATCH 2/3] Fix su gestione access token negli interceptor

---
 .../core/rest/AuthInterceptor.java            | 13 +------------
 .../core/rest/HttpInterceptor.java            | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 21 deletions(-)

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 d7c4932d..4014cbf2 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
@@ -2,14 +2,10 @@ package it.integry.integrywmsnative.core.rest;
 
 import androidx.annotation.NonNull;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.IOException;
 
 import io.jsonwebtoken.Claims;
 import it.integry.integrywmsnative.core.authentication.JwtUtils;
-import it.integry.integrywmsnative.core.event.SessionExpiredEvent;
-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;
@@ -49,10 +45,8 @@ public class AuthInterceptor implements Interceptor {
                             .setRefreshTokenExpiryDate(response.getExpiryDate());
 
                     SettingsManager.update();
-                } catch (UnauthorizedAccessException uae) {
-                    //Globally managed
                 } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    return chain.proceed(originalRequest);
                 }
 
 
@@ -69,9 +63,4 @@ public class AuthInterceptor implements Interceptor {
     }
 
 
-    private void notifySessionExpired() {
-        EventBus.getDefault().post(new SessionExpiredEvent());
-    }
-
-
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
index 0bc1bef5..db1cda35 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
@@ -21,13 +21,6 @@ public class HttpInterceptor implements Interceptor {
         final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
         final String APP_TOKEN      = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
 
-        String accessToken = null;
-
-        if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null &&
-                UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate())) {
-            accessToken = SettingsManager.i().getUserSession().getAccessToken();
-        }
-
         final Request request = chain.request();
         final HttpUrl url = request.url().newBuilder()
                 .addQueryParameter("profileDb", PROFILE_DB)
@@ -38,9 +31,17 @@ public class HttpInterceptor implements Interceptor {
                 .addHeader("Accept", "*/*")
                 .addHeader("x-app-token", APP_TOKEN);
 
+
+        String accessToken = null;
+
+        //Nel caso in cui il token è scaduto e devo richiamare la refresh non bisogna passare il vecchio token
+        if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null &&
+                UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate())) {
+            accessToken = SettingsManager.i().getUserSession().getAccessToken();
+        }
+
         if(accessToken != null)
-            builder
-                .addHeader("Authorization", "Bearer " + accessToken);
+            builder.header("Authorization", "Bearer " + accessToken);
 
         var newRequest = builder
                 .url(url)

From 361faf235d0bde5d0b2f93932dd9d0e588f6b1d1 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 19 Feb 2025 10:13:09 +0100
Subject: [PATCH 3/3] -> v1.44.02 (471)

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

diff --git a/app/build.gradle b/app/build.gradle
index c24ef7f2..d284e715 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 470
-    def appVersionName = '1.44.01'
+    def appVersionCode = 471
+    def appVersionName = '1.44.02'
 
     signingConfigs {
         release {