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

Merge branch 'master' into feature/RefactoringGestioneColli

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
#	app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
This commit is contained in:
Giuseppe Scorrano
2025-10-28 11:49:45 +01:00
parent bf39eccf72 990a4d1538
commit 0363f9c835
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 536
def appVersionName = '1.47.23'
def appVersionCode = 538
def appVersionName = '1.47.25'
signingConfigs {
release {

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

@@ -17,18 +17,19 @@ public class HttpInterceptor implements Interceptor {
@Override
public Response intercept(Chain chain) throws IOException {
final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
final String APP_TOKEN = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
final String APP_TOKEN = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
final Request request = chain.request();
final HttpUrl.Builder httpUrlBuilder = request.url().newBuilder();
HttpUrl.Builder urlBuilder = chain.request().url().newBuilder();
if(PROFILE_DB != null)
httpUrlBuilder.addQueryParameter("profileDb", PROFILE_DB);
if (!UtilityString.isNullOrEmpty(PROFILE_DB))
urlBuilder
.addQueryParameter("profileDb", PROFILE_DB);
HttpUrl url = httpUrlBuilder.build();
HttpUrl url = urlBuilder.build();
Request.Builder builder = chain.request().newBuilder()
final Request.Builder requestBuilder = chain.request().newBuilder();
Request.Builder builder = requestBuilder
.addHeader("Content-Type", "application/json")
.addHeader("Accept", "*/*")
.addHeader("x-app-token", APP_TOKEN);

1
app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
View File

@@ -47,7 +47,6 @@ public class RESTBuilder {
clientBuilder.addInterceptor(authInterceptor);
clientBuilder.addInterceptor(new HttpInterceptor());
if (ADD_LOGGER_INTERCEPTOR) clientBuilder.addInterceptor(new HttpLoggerInterceptor());
client = clientBuilder.build();