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

Finish v1.44.04(473)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-02-24 15:31:21 +01:00
commit 36c48f28d1
3 changed files with 17 additions and 4 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 = 472 def appVersionCode = 473
def appVersionName = '1.44.03' def appVersionName = '1.44.04'
signingConfigs { signingConfigs {
release { release {

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

@ -6,11 +6,14 @@ 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.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;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.Protocol;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody;
public class AuthInterceptor implements Interceptor { public class AuthInterceptor implements Interceptor {
@ -30,7 +33,7 @@ public class AuthInterceptor implements Interceptor {
var accessToken = SettingsManager.i().getUserSession().getAccessToken(); var accessToken = SettingsManager.i().getUserSession().getAccessToken();
var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate(); 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 // Make the token refresh request
try { try {
@ -45,6 +48,15 @@ public class AuthInterceptor implements Interceptor {
.setRefreshTokenExpiryDate(response.getExpiryDate()); .setRefreshTokenExpiryDate(response.getExpiryDate());
SettingsManager.update(); 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) { } catch (Exception e) {
return chain.proceed(originalRequest); return chain.proceed(originalRequest);
} }

3
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
View File

@ -552,7 +552,8 @@ public class PickingLiberoViewModel {
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
if (!destNewMtbColr.isEmpty()) { 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(); MtbColt clonedTestata = (MtbColt) sourceMtbColt.clone();
clonedTestata.getMtbColr().clear(); clonedTestata.getMtbColr().clear();