Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.44.02(471)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-02-19 10:13:13 +01:00
commit c5720059f3
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 470 def appVersionCode = 471
def appVersionName = '1.44.01' def appVersionName = '1.44.02'
signingConfigs { signingConfigs {
release { release {

13
app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
View File

@ -2,14 +2,10 @@ package it.integry.integrywmsnative.core.rest;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.greenrobot.eventbus.EventBus;
import java.io.IOException; import java.io.IOException;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import it.integry.integrywmsnative.core.authentication.JwtUtils; 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.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer; import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer;
@ -49,10 +45,8 @@ public class AuthInterceptor implements Interceptor {
.setRefreshTokenExpiryDate(response.getExpiryDate()); .setRefreshTokenExpiryDate(response.getExpiryDate());
SettingsManager.update(); SettingsManager.update();
} catch (UnauthorizedAccessException uae) {
//Globally managed
} catch (Exception e) { } 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());
}
} }

19
app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
View File

@ -21,13 +21,6 @@ public class HttpInterceptor implements Interceptor {
final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB(); final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
final String APP_TOKEN = "fa3a21af-606b-4129-a22b-aedc2a52c7b6"; 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 Request request = chain.request();
final HttpUrl url = request.url().newBuilder() final HttpUrl url = request.url().newBuilder()
.addQueryParameter("profileDb", PROFILE_DB) .addQueryParameter("profileDb", PROFILE_DB)
@ -38,9 +31,17 @@ public class HttpInterceptor implements Interceptor {
.addHeader("Accept", "*/*") .addHeader("Accept", "*/*")
.addHeader("x-app-token", APP_TOKEN); .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) if(accessToken != null)
builder builder.header("Authorization", "Bearer " + accessToken);
.addHeader("Authorization", "Bearer " + accessToken);
var newRequest = builder var newRequest = builder
.url(url) .url(url)

2
app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
View File

@ -186,7 +186,7 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:textAppearance="@style/TextAppearance.Material3.BodySmall"
android:textColor="?attr/colorOutline" android:textColor="?attr/colorOutline"
tools:text="Lavorazione"/> tools:text="Lavorazione"/>