Finish v1.47.13(526)

# Conflicts:
#	app/build.gradle

.idea/codeStyles/Project.xml

@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

Jenkinsfile.groovy

@@ -0,0 +1,72 @@
+pipeline {
+    agent {
+        label 'master'
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10'))
+        disableConcurrentBuilds()
+    }
+
+    environment {
+        // ANDROID_HOME = "/usr/local/android/sdk" // Cambia in base al tuo sistema
+        JAVA_HOME = tool 'JDK 17.0.6 x64'          // Nome dello strumento configurato in Jenkins
+        PATH = "${env.JAVA_HOME}\\bin;${env.PATH}"
+    }
+
+    stages {
+
+        stage('Preparing') {
+            when {
+                expression {
+                    return env.GIT_BRANCH == "master-beta"
+                }
+            }
+            steps {
+                bat "./gradlew addBetaSuffix"
+            }
+        }
+
+        stage('Build') {
+            steps {
+                bat "./gradlew assembleRelease"
+                archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true
+            }
+        }
+
+        stage('Publish') {
+            steps {
+                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
+            }
+        }
+    }
+
+    post {
+        success {
+            script {
+                bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
+                bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
+                bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
+                bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                }
+            }
+        }
+        unstable {
+            script {
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                }
+            }
+        }
+        failure {
+            script {
+                if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
+                    office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                }
+            }
+        }
+    }
+
+}

app/build.gradle

@@ -8,10 +8,11 @@ apply plugin: 'com.google.firebase.crashlytics'
 //apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
+
 android {
 
-    def appVersionCode = 501
+    def appVersionCode = 526
-    def appVersionName = '1.46.13'
+    def appVersionName = '1.47.13'
 
     signingConfigs {
         release {
@@ -34,7 +35,7 @@ android {
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdk 36
         versionCode appVersionCode
         versionName appVersionName
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,11 +52,18 @@ android {
     buildTypes {
         debug {
             ext.enableCrashlytics = false
+//            minifyEnabled true // Abilita la minimizzazione del codice
+//            shrinkResources true // Rimuove risorse non utilizzate
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
-            minifyEnabled false
+//            minifyEnabled true // Abilita la minimizzazione del codice
+//            shrinkResources true // Rimuove risorse non utilizzate
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
+            firebaseCrashlytics {
+                mappingFileUploadEnabled true
+            }
         }
     }
 
@@ -74,12 +82,7 @@ android {
     }
 
 
-    build {
+
-        doLast {
-            delete "$projectDir/build/outputs/apk/release/version.txt"
-            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true'
-        }
-    }
 
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile.class).tap {
@@ -92,7 +95,7 @@ android {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-    compileSdk 35
+    compileSdk 36
 }
 
 configurations {
@@ -107,30 +110,27 @@ dependencies {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
 //    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
     implementation 'com.github.lupaulus:logger:2.3.2'
 
-    //Firebase
-
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:33.13.0')
+    implementation platform('com.google.firebase:firebase-bom:33.16.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.7.0'
+    implementation 'com.google.android.gms:play-services-basement:18.7.1'
 
     //JJWT
-    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
-    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
 
-    implementation 'com.google.guava:guava:33.4.0-android'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
-
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     implementation('androidx.preference:preference-ktx:1.2.1') {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
@@ -138,19 +138,18 @@ dependencies {
     }
 
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.retrofit2:retrofit:3.0.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.9.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.9.3'
-    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'org.apache.commons:commons-text:1.14.0'
 
     //MVVM
-    def dagger2_version = '2.55'
+    def dagger2_version = '2.57.1'
-    api "com.google.dagger:dagger:$dagger2_version"
+    implementation "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
-    api "com.google.dagger:dagger-android:$dagger2_version"
+    implementation "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger2_version"
     // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"
 
@@ -162,7 +161,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.7.1"
+    def room_version = "2.7.2"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -188,13 +187,10 @@ dependencies {
     implementation 'com.github.harry1453:android-bluetooth-serial:v1.1.2'
 
     // RxJava is also required.
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-
-    implementation 'org.greenrobot:eventbus:3.3.1'
 
     //Barcode generator
-//    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 }
 
@@ -203,3 +199,49 @@ repositories {
     google()
     maven { url 'https://jitpack.io' }
 }
+
+tasks.register('addBetaSuffix') {
+    doLast {
+        def gradleFile = file("build.gradle")
+        def content = gradleFile.text
+
+        // Modifica appVersionName
+        content = content.replaceAll(/appVersionName\s*=\s*'(.*?)'/) { fullMatch, version ->
+            "appVersionName = '${version}-beta'"
+        }
+
+        // Modifica outputFileName
+        content = content.replaceAll(/output\.outputFileName\s*=\s*"(.*?)"/) { fullMatch, filename ->
+            "output.outputFileName = \"${filename.replace('.apk', '-beta.apk')}\""
+        }
+
+        // Modifica direttamente la riga che crea 'version.txt' in 'version-beta.txt'
+        content = content.replace(
+                "def versionFile = new File(outputDir, \"version.txt\")",
+                "def versionFile = new File(outputDir, \"version-beta.txt\")"
+        )
+
+        // Sovrascrivi il file
+        gradleFile.write(content)
+    }
+}
+
+tasks.register('createVersionFile') {
+    doLast {
+        def outputDir = file("${projectDir}/build/outputs/apk/release")
+        def versionFile = new File(outputDir, "version.txt")
+
+        // Cancella il file se esiste
+        if (versionFile.exists()) {
+            versionFile.delete()
+        }
+
+        // Crea il file con i contenuti desiderati
+        versionFile.write("${android.defaultConfig.versionCode}\n${android.defaultConfig.versionName}\nforced=true")
+    }
+}
+
+
+afterEvaluate {
+    tasks.assembleRelease.finalizedBy createVersionFile
+}

app/proguard-rules.pro

@@ -23,3 +23,26 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+# Prevent R8 from leaving Data object members always null
+-keepclasseswithmembers class * {
+    <init>(...);
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Per JJWT
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+-keep class it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; }
+-keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; }

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -313,8 +313,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) {
+    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
-        return new DocumentRESTConsumer(restBuilder);
+        return new DocumentRESTConsumer(restBuilder, executorService);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java

@@ -24,19 +24,4 @@ public class CommonConst {
         public static String RECOVER_COLLO_FILE = "recover_ul.json";
     }
 
-    public static class Mail {
-
-        public static String[] forErrorsDebug = {
-                "g.scorrano@integry.it",
-                "v.castellana@integry.it"
-        };
-
-        public static String[] forErrors = {
-//                "syslogs@integry.it",
-                "g.scorrano@integry.it",
-                "v.castellana@integry.it"
-        };
-
-    }
-
 }

app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java

@@ -11,11 +11,11 @@ public class JwtUtils {
     private final static String SIGNING_KEY = "gICy3bjD56i/YFnBZZKe5ibiz3Snsp08nybGGziCV4ZcvyXBbyqWUnJ2wTrRXhOuf/xdljPXX0yBaqdAgvKthQ==";
 
     public static Claims parseJwt(String token) {
-        Jws<Claims> jws = Jwts.parserBuilder()
+        Jws<Claims> jws = Jwts.parser()
-                .setSigningKey(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY)))
+                .verifyWith(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY)))
                 .build()
-                .parseClaimsJws(token);
+                .parseSignedClaims(token);
 
-        return jws.getBody();
+        return jws.getPayload();
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java

@@ -90,10 +90,10 @@ public class AppContext {
         Logger.addLogAdapter(new AndroidLogAdapter());
 
         logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
+        removeOldLogs(logsFolder);
+
         int maxBytesSize = 5 * 1024 * 1024;
         Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
-
-        removeOldLogs(logsFolder);
     }
 
     private void removeOldLogs(File logsFolder) {

app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java

@@ -66,9 +66,6 @@ public class Ean128Service {
 
                     switch (aiModel.AI) {
                         case SSCC -> {
-                            if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) {
-                                aiValue = new StringBuilder(aiValue.substring(1));
-                            }
                             model.Sscc = aiValue.toString();
                         }
                         case GTIN -> {

app/src/main/java/it/integry/integrywmsnative/core/model/dto/AlreadyRegisteredUlDTO.java

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.model.dto;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
 
-public class AlreadyRegisteredUDCDTO {
+public class AlreadyRegisteredUlDTO {
 
     private MtbColt mtbColt;
 
@@ -13,7 +13,7 @@ public class AlreadyRegisteredUDCDTO {
         return mtbColt;
     }
 
-    public AlreadyRegisteredUDCDTO setMtbColt(MtbColt mtbColt) {
+    public AlreadyRegisteredUlDTO setMtbColt(MtbColt mtbColt) {
         this.mtbColt = mtbColt;
         return this;
     }
@@ -22,7 +22,7 @@ public class AlreadyRegisteredUDCDTO {
         return canBeRecovered;
     }
 
-    public AlreadyRegisteredUDCDTO setCanBeRecovered(boolean canBeRecovered) {
+    public AlreadyRegisteredUlDTO setCanBeRecovered(boolean canBeRecovered) {
         this.canBeRecovered = canBeRecovered;
         return this;
     }

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

@@ -28,7 +28,7 @@ public class AuthInterceptor implements Interceptor {
     public Response intercept(@NonNull Chain chain) throws IOException {
         var originalRequest = chain.request();
 
-        if (SettingsManager.i().getUserSession() != null) {
+        if (SettingsManager.i().getUserSession() != null && SettingsManager.i().getUserSession().getAccessToken() != null) {
 
             var accessToken = SettingsManager.i().getUserSession().getAccessToken();
             var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
@@ -55,21 +55,22 @@ public class AuthInterceptor implements Interceptor {
                             .protocol(Protocol.HTTP_1_1)
                             .code(401)
                             .message("Unauthorized")
-                            .body(ResponseBody.create(new byte[0], null))
+                            .body(ResponseBody.create(okhttp3.MediaType.get("application/json"), new byte[0]))
                             .build();
                 } catch (Exception e) {
                     return chain.proceed(originalRequest);
                 }
 
+                //Retrieve the new access token after refresh
+                accessToken = SettingsManager.i().getUserSession().getAccessToken();
+            }
 
-                // Add the access token to the request header
+            // Add the access token to the request header
-                var authorizedRequest = originalRequest.newBuilder()
+            var authorizedRequest = originalRequest.newBuilder()
-                        .header("Authorization", "Bearer " + SettingsManager.i().getUserSession().getAccessToken())
+                    .header("Authorization", "Bearer " + accessToken)
-                        .build();
+                    .build();
 
-                return chain.proceed(authorizedRequest);
+            return chain.proceed(authorizedRequest);
-            } else
-                return chain.proceed(originalRequest);
         } else
             return chain.proceed(originalRequest);
     }

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

@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.rest;
 import java.io.IOException;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -31,18 +30,6 @@ 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().minusSeconds(20))) {
-            accessToken = SettingsManager.i().getUserSession().getAccessToken();
-        }
-
-        if(accessToken != null)
-            builder.header("Authorization", "Bearer " + accessToken);
-
         var newRequest = builder
                 .url(url)
                 .build();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import androidx.annotation.NonNull;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -20,9 +21,11 @@ import retrofit2.Response;
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
-    public DocumentRESTConsumer(RESTBuilder restBuilder) {
+    public DocumentRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
     }
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -40,17 +43,22 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+    public DtbDoct makeSynchronousCreateDocFromColliRequest(LoadColliDTO loadColliDTO) throws Exception {
         DocumentiRESTConsumerService documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class);
-        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new ManagedErrorCallback<>() {
+        var response = documentiRESTConsumerService
-            @Override
+                .createDocFromColli(loadColliDTO)
-            public void onResponse(Call<ServiceRESTResponse<DtbDoct>> call, Response<ServiceRESTResponse<DtbDoct>> response) {
+                .execute();
-                analyzeAnswer(response, "createDocFromColli", onComplete, onFailed);
-            }
 
-            @Override
+        return analyzeAnswer(response, "createDocFromColli");
-            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, @NonNull final Exception e) {
+    }
-                onFailed.run(e);
+
+    public void makeCreateDocFromColliRequest(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = makeSynchronousCreateDocFromColliRequest(loadColliDTO);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java

@@ -5,8 +5,11 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 
 public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
 
@@ -30,12 +33,36 @@ public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
         return giacenzeList != null ? giacenzeList : new ArrayList<>();
     }
 
-    public void saveNewVerificaSynchronized(SaveNewVerificaRequestDTO saveNewVerificaRequest) throws Exception {
+    public void saveNewRowSynchronized(SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest) throws Exception {
         GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
-        var response = giacenzaPvRESTConsumerService.saveNewVerifica(saveNewVerificaRequest)
+        var response = giacenzaPvRESTConsumerService.saveNewRowVerifica(saveNewRowVerificaRequest)
                 .execute();
 
-        analyzeAnswer(response, "save-verifica-pv");
+        analyzeAnswer(response, "save-row-verifica-pv");
+    }
+
+    public void updateRowSynchronized(UpdateRowVerificaRequestDTO updateRowVerificaRequest) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.updateRowVerifica(updateRowVerificaRequest)
+                .execute();
+
+        analyzeAnswer(response, "update-row-verifica-pv");
+    }
+
+    public void deleteRowSynchronized(DeleteRowVerificaRequestDTO deleteRowVerificaRequest) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.deleteRowVerifica(deleteRowVerificaRequest)
+                .execute();
+
+        analyzeAnswer(response, "delete-row-verifica-pv");
+    }
+
+    public void closeVerifica(CloseVerificaRequestDTO closeVerificaRequestDTO) throws Exception {
+        GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0);
+        var response = giacenzaPvRESTConsumerService.closeVerifica(closeVerificaRequestDTO)
+                .execute();
+
+        analyzeAnswer(response, "close-verifica-pv");
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java

@@ -3,8 +3,11 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -17,6 +20,15 @@ public interface GiacenzaPvRESTConsumerService {
     Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep);
 
 
-    @POST("wms/pv/verifica_giacenze/save_new_verifica")
+    @POST("wms/pv/verifica_giacenze/save_new_row")
-    Call<ServiceRESTResponse<Void>> saveNewVerifica(@Body SaveNewVerificaRequestDTO saveNewVerificaRequest);
+    Call<ServiceRESTResponse<Void>> saveNewRowVerifica(@Body SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest);
+
+    @POST("wms/pv/verifica_giacenze/update_row")
+    Call<ServiceRESTResponse<Void>> updateRowVerifica(@Body UpdateRowVerificaRequestDTO updateRowVerificaRequest);
+
+    @POST("wms/pv/verifica_giacenze/delete_row")
+    Call<ServiceRESTResponse<Void>> deleteRowVerifica(@Body DeleteRowVerificaRequestDTO deleteRowVerificaRequest);
+
+    @POST("wms/pv/verifica_giacenze/close_verifica")
+    Call<ServiceRESTResponse<Void>> closeVerifica(@Body CloseVerificaRequestDTO closeVerificaRequest);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -4,11 +4,8 @@ import androidx.annotation.NonNull;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
@@ -21,6 +18,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -28,8 +26,7 @@ import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
-import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import retrofit2.Call;
@@ -180,44 +177,27 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<AlreadyRegisteredUlDTO> getBancaliGiaRegistratiSynchronized(List<? extends OrdineInevasoDTO> orders, int segno) throws Exception {
-        String whereCondGestione = "";
+        OrdiniRESTConsumerService service = restBuilder.getService(OrdiniRESTConsumerService.class);
 
-        if (gestione != null) {
+        var request = new RetrieveAlreadyRegisteredUdsRequestDTO()
-            whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " ";
+                .setOrdini(orders)
-        } else {
+                .setSegno(segno);
-            whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') ";
-        }
 
-        String baseSql = "SELECT DISTINCT mtb_colt.* " +
+        var response = service.retrieveAlreadyRegisteredUDS(request)
-                "FROM mtb_colt " +
+                .execute();
-                "       INNER JOIN mtb_colr ON " +
+        var data = analyzeAnswer(response, "getBancaliGiaRegistrati");
-                "       mtb_colt.gestione = mtb_colr.gestione " +
+        return data == null || data.getUdsList() == null ? new ArrayList<>() : data.getUdsList();
-                "        AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
+    }
-                "        AND mtb_colt.data_collo = mtb_colr.data_collo " +
-                "        AND mtb_colt.num_collo = mtb_colr.num_collo " +
-                " WHERE " + whereCondGestione +
-                "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
-                "  AND mtb_colt.data_doc IS NULL AND ";
 
-        List<HashMap<String, Object>> whereCondMapList = new ArrayList<>();
+    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, int segno, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        for (OrdineInevasoDTO ordineInevaso : orders) {
+        executorService.execute(() -> {
-            HashMap<String, Object> whereCondMap = new HashMap<>();
+            try {
-            whereCondMap.put("mtb_colr.data_ord", ordineInevaso.getDataOrdD());
+                var result = getBancaliGiaRegistratiSynchronized(orders, segno);
-            whereCondMap.put("mtb_colr.num_ord", ordineInevaso.getNumOrd());
+                if (onComplete != null) onComplete.run(result);
-            whereCondMap.put("mtb_colr.gestione", ordineInevaso.getGestione());
+            } catch (Exception ex) {
-
+                if (onFailed != null) onFailed.run(ex);
-            whereCondMapList.add(whereCondMap);
+            }
-        }
-
-        baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
-        }.getType();
-        this.mSystemRESTConsumer.<List<MtbColt>>processSql(baseSql, typeOfObjectsList, value -> {
-            if (onComplete != null) onComplete.run(value);
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
         });
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java

@@ -5,6 +5,8 @@ import java.util.List;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsResponseDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import retrofit2.Call;
@@ -23,4 +25,7 @@ public interface OrdiniRESTConsumerService {
 
     @GET("SM2GetOrdiniVenditaInevasi")
     Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> getOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
+
+    @POST("wms/spedizione/retrieveAlreadyRegisteredUDS")
+    Call<ServiceRESTResponse<RetrieveAlreadyRegisteredUdsResponseDTO>> retrieveAlreadyRegisteredUDS(@Body RetrieveAlreadyRegisteredUdsRequestDTO request);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -125,13 +125,12 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
     public void printClosedOrdersSynchronized(PrintOrderCloseDTO dto, String codMdep) throws Exception {
         if (BuildConfig.DEBUG) {
-            return;
+//            return;
         }
 
         PrinterRESTConsumerService printerService = restBuilder.getService(PrinterRESTConsumerService.class, 240);
-        Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);
 
-        var response = callable.execute();
+        var response = printerService.printClosedOrders(codMdep, dto).execute();
         analyzeAnswer(response, "printCollo");
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java

@@ -1,8 +1,5 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import android.text.TextUtils;
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
@@ -17,8 +14,6 @@ import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -27,9 +22,7 @@ import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
 import retrofit2.Response;
 
@@ -110,36 +103,6 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
-    public void sendErrorLogMail(String message, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : " [" + SettingsManager.i().getUserSession().getProfileDB() + "]";
-
-        String dest = "";
-        if (BuildConfig.DEBUG) {
-            dest = TextUtils.join(";", CommonConst.Mail.forErrorsDebug);
-        } else {
-            dest = TextUtils.join(";", CommonConst.Mail.forErrors);
-        }
-
-
-        MailRequestDTO mailDTO = new MailRequestDTO()
-                .setFrom("sender@integry.it")
-                .setFromName((BuildConfig.DEBUG ? "[DEBUG] " : "") + "WMS Android")
-                .setTo(dest)
-                .setSubject("Bug notification" + currentAzienda)
-                .setMsgText(message)
-                .setHtml(true);
-
-        sendMail(mailDTO, () -> {
-            if (onComplete != null) onComplete.run();
-        }, ex -> {
-            Log.e(SystemRESTConsumer.class.getName(), "", ex);
-            if (onFailed != null) onFailed.run(ex);
-        });
-    }
-
-
     public void sendMailSynchronized(MailRequestDTO mailDTO) throws Exception {
         SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
         var response = service.sendMail(mailDTO).execute();

app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java

@@ -1,8 +1,13 @@
 package it.integry.integrywmsnative.core.rest.model;
 
+import com.google.gson.annotations.SerializedName;
+
 public class AvailableCodMdepsDTO {
 
+    @SerializedName("codMdep")
     private String codMdep;
+
+    @SerializedName("descrizione")
     private String descrizione;
 
     public String getCodMdep() {

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/CloseVerificaRequestDTO.java

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class CloseVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public CloseVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public CloseVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/DeleteRowVerificaRequestDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class DeleteRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public DeleteRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public DeleteRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public DeleteRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewRowVerificaRequestDTO.java

@@ -0,0 +1,38 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class SaveNewRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public SaveNewRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public SaveNewRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public SaveNewRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java

@@ -1,15 +0,0 @@
-package it.integry.integrywmsnative.core.rest.model.pv;
-
-public class SaveNewVerificaRequestDTO {
-
-    private VerificaGiacenzeDTO data;
-
-    public VerificaGiacenzeDTO getData() {
-        return data;
-    }
-
-    public SaveNewVerificaRequestDTO setData(VerificaGiacenzeDTO data) {
-        this.data = data;
-        return this;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/UpdateRowVerificaRequestDTO.java

@@ -0,0 +1,38 @@
+package it.integry.integrywmsnative.core.rest.model.pv;
+
+import java.time.LocalDateTime;
+
+public class UpdateRowVerificaRequestDTO {
+
+    private String codMdep;
+    private LocalDateTime dataVerifica;
+    private VerificaGiacenzeRowDTO row;
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public UpdateRowVerificaRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public LocalDateTime getDataVerifica() {
+        return dataVerifica;
+    }
+
+    public UpdateRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) {
+        this.dataVerifica = dataVerifica;
+        return this;
+    }
+
+    public VerificaGiacenzeRowDTO getRow() {
+        return row;
+    }
+
+    public UpdateRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) {
+        this.row = row;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsRequestDTO.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+
+public class RetrieveAlreadyRegisteredUdsRequestDTO {
+
+    private List<? extends OrdineInevasoDTO> ordini;
+    private int segno;
+
+    public List<? extends OrdineInevasoDTO> getOrdini() {
+        return ordini;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setOrdini(List<? extends OrdineInevasoDTO> ordini) {
+        this.ordini = ordini;
+        return this;
+    }
+
+    public int getSegno() {
+        return segno;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setSegno(int segno) {
+        this.segno = segno;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsResponseDTO.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
+
+public class RetrieveAlreadyRegisteredUdsResponseDTO {
+
+    private List<AlreadyRegisteredUlDTO> udsList;
+
+    public List<AlreadyRegisteredUlDTO> getUdsList() {
+        return udsList;
+    }
+
+    public RetrieveAlreadyRegisteredUdsResponseDTO setUdsList(List<AlreadyRegisteredUlDTO> udsList) {
+        this.udsList = udsList;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -98,6 +98,7 @@ public class DBSettingsModel {
     private boolean flagAccettazioneGroupListForn = false;
     private boolean flagSpedizioneEnableFastPicking = false;
     private boolean flagAccettazioneBollaEditableQtaTot = true;
+    private boolean flagViewSwitchDepoButton = true;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -824,4 +825,12 @@ public class DBSettingsModel {
     public void setFlagAccettazioneBollaEditableQtaTot(boolean flagAccettazioneBollaEditableQtaTot) {
         this.flagAccettazioneBollaEditableQtaTot = flagAccettazioneBollaEditableQtaTot;
     }
+
+    public boolean isFlagViewSwitchDepoButton() {
+        return flagViewSwitchDepoButton;
+    }
+
+    public void setFlagViewSwitchDepoButton(boolean flagViewSwitchDepoButton) {
+        this.flagViewSwitchDepoButton = flagViewSwitchDepoButton;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -39,8 +39,6 @@ public class SettingsManager {
     private static SettingsModel settingsModelIstance;
     private static DBSettingsModel dbSettingsModelIstance;
 
-    private static boolean firstStart = false;
-
     private static Context mContext;
     private static SystemRESTConsumer mSystemRESTConsumer;
     private static ImballiRESTConsumer mImballiRESTConsumer;
@@ -65,15 +63,15 @@ public class SettingsManager {
     public void init() {
         settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
 
-        if (settingsModelIstance == null) {
+        if (settingsModelIstance == null)
             settingsModelIstance = new SettingsModel();
 
+
+        if (settingsModelIstance.getServer() == null)
             settingsModelIstance.setServer(new SettingsModel.Server());
-            firstStart = true;
+
-        }
 
         dbSettingsModelIstance = new DBSettingsModel();
-
     }
 
     public SettingsModel getSettings() {
@@ -89,10 +87,6 @@ public class SettingsManager {
         return dbSettingsModelIstance;
     }
 
-    public static boolean isFirstStart() {
-        return firstStart;
-    }
-
     public static boolean isInstanceAvailable() {
         return i() != null;
     }
@@ -623,6 +617,13 @@ public class SettingsManager {
                 .setKeySection("ENABLE_ART_CREATION")
                 .setSetter(dbSettingsModelIstance::setFlagEnableArtCreation));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("VIEW_SWITCH_DEPO_BUTTON")
+                .setSetter(dbSettingsModelIstance::setFlagViewSwitchDepoButton)
+        );
+
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("SETUP")

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java

@@ -78,7 +78,7 @@ public class UtilityBarcode {
 
 
     public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) {
-        return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("2");
+        return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().length() == 13 && barcodeScanDTO.getStringValue().startsWith("2");
     }
 
     public static boolean isEan8(BarcodeScanDTO barcodeScanDTO) {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java

@@ -42,7 +42,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
@@ -452,12 +452,12 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         dialog.show();
     }
 
-    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUDCDTO> mtbColts) {
+    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUlDTO> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
 
                 Stream.of(mtbColts)
-                        .map(AlreadyRegisteredUDCDTO::getMtbColt)
+                        .map(AlreadyRegisteredUlDTO::getMtbColt)
                         .toList(),
 
                 input -> Stream.of(mtbColts)

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java

@@ -30,7 +30,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -160,7 +160,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
 
-    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete) {
+    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mAccettazioneBollaPickingRESTConsumer.retrieveAlreadyRegisteredUDC(this.mBolle, mtbColtList -> {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/dto/RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO.java

@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 
 public class RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO {
 
-    private List<AlreadyRegisteredUDCDTO> udcList;
+    private List<AlreadyRegisteredUlDTO> udcList;
 
-    public List<AlreadyRegisteredUDCDTO> getUdcList() {
+    public List<AlreadyRegisteredUlDTO> getUdcList() {
         return udcList;
     }
 
-    public RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO setUdcList(List<AlreadyRegisteredUDCDTO> udcList) {
+    public RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO setUdcList(List<AlreadyRegisteredUlDTO> udcList) {
         this.udcList = udcList;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java

@@ -9,7 +9,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -32,7 +32,7 @@ public class AccettazioneBollaPickingRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void retrieveAlreadyRegisteredUDC(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveAlreadyRegisteredUDC(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         AccettazioneBollaPickingRESTConsumerService service = restBuilder.getService(AccettazioneBollaPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneBollaRequestDTO()

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -45,7 +45,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
@@ -690,11 +690,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         dialog.show();
     }
 
-    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUDCDTO> mtbColts) {
+    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUlDTO> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
 
-                Stream.of(mtbColts).map(AlreadyRegisteredUDCDTO::getMtbColt).toList(),
+                Stream.of(mtbColts).map(AlreadyRegisteredUlDTO::getMtbColt).toList(),
 
                 input -> Stream.of(mtbColts).filter(x -> x.getMtbColt() == input).findFirstOrElse(null).isCanBeRecovered(),
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java

@@ -32,7 +32,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -198,7 +198,7 @@ public class AccettazioneOrdiniPickingViewModel {
         return mPickingList;
     }
 
-    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete) {
+    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mAccettazioneOrdiniPickingRESTConsumer.getBancaliGiaRegistrati(this.mOrders, mtbColtList -> {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/dto/RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO.java

@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 
 public class RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO {
 
-    private List<AlreadyRegisteredUDCDTO> udcList;
+    private List<AlreadyRegisteredUlDTO> udcList;
 
-    public List<AlreadyRegisteredUDCDTO> getUdcList() {
+    public List<AlreadyRegisteredUlDTO> getUdcList() {
         return udcList;
     }
 
-    public RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO setUdcList(List<AlreadyRegisteredUDCDTO> udcList) {
+    public RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO setUdcList(List<AlreadyRegisteredUlDTO> udcList) {
         this.udcList = udcList;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java

@@ -9,7 +9,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
@@ -33,7 +33,7 @@ public class AccettazioneOrdiniPickingRESTConsumer extends _BaseRESTConsumer {
         this.systemRestConsumer = systemRESTConsumer;
     }
 
-    public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         AccettazioneOrdiniPickingRESTConsumerService service = restBuilder.getService(AccettazioneOrdiniPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneOrdineRequestDTO()

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java

@@ -45,9 +45,7 @@ public class DialogSelectDocInfo_FornitoreAdapter extends ArrayAdapter<DialogSel
 
         @Override
         public String toString() {
-            return this.getOriginalModel().getCodAnag() +
+            return this.getOriginalModel().getDescrizione();
-                    (this.getOriginalModel().getCodVdes() != null ? " - " + this.getOriginalModel().getCodVdes() : "") +
-                    " ( " + this.getOriginalModel().getDescrizione() + " )";
         }
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java

@@ -50,7 +50,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     public final ObservableField<MtbColt> mtbColt = new ObservableField<>();
     public final ObservableField<String> descrizioneDepo = new ObservableField<>();
     public ObservableField<Boolean> fabVisible = new ObservableField<>(true);
-    public ObservableField<Boolean> recoverFabMenuVisible = new ObservableField<>(false);
+    public Boolean recoverFabMenuVisible = false;
     private PopupMenu fabPopupMenu;
 
     private String mReportName;
@@ -80,7 +80,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        boolean canRecoverUL = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
+        recoverFabMenuVisible = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
         mtbColt.set(DataCache.retrieveItem(getIntent().getStringExtra(Key.MtbColtKey)));
         mReportName = DataCache.retrieveItem(getIntent().getStringExtra(Key.ReportName));
 
@@ -102,8 +102,6 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
         mViewModel.setListener(this);
         mViewModel.init(mtbColt.get(), mReportName);
 
-        recoverFabMenuVisible.set(canRecoverUL);
-
         this.initRecyclerView();
         this.initColloInfo();
         this.initFab();
@@ -144,6 +142,10 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
             fabPopupMenu.getMenu().removeItem(R.id.delete_ul);
         }
 
+        if(!recoverFabMenuVisible) {
+            fabPopupMenu.getMenu().removeItem(R.id.recover_ul);
+        }
+
         fabPopupMenu.setOnMenuItemClickListener(item -> {
             int itemId = item.getItemId();
 

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthTokenClaimsDTO.java

@@ -1,11 +1,17 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.HashMap;
 
 public class AuthTokenClaimsDTO {
 
+    @SerializedName("deviceId")
     private long deviceId;
+
+    @SerializedName("userDTO")
     private User userDTO;
+
+    @SerializedName("profilesData")
     private HashMap<String, AuthTokenProfileDetails> profilesData;
 
     public long getDeviceId() {
@@ -36,11 +42,22 @@ public class AuthTokenClaimsDTO {
     }
 
     public class User {
+        @SerializedName("username")
         private String username;
+
+        @SerializedName("email")
         private Object email;
+
+        @SerializedName("fullname")
         private String fullname;
+
+        @SerializedName("keyGroup")
         private int keyGroup;
+
+        @SerializedName("attivo")
         private boolean attivo;
+
+        @SerializedName("type")
         private String type;
 
         public String getUsername() {
@@ -99,6 +116,7 @@ public class AuthTokenClaimsDTO {
     }
 
     public static class AuthTokenProfileDetails {
+        @SerializedName("defaultDepo")
         private AuthTokenDepoDetails defaultDepo;
 
         public AuthTokenDepoDetails getDefaultDepo() {
@@ -112,8 +130,13 @@ public class AuthTokenClaimsDTO {
     }
 
     public static class AuthTokenDepoDetails {
+        @SerializedName("codMdep")
         private String codMdep;
+
+        @SerializedName("descrizione")
         private String descrizione;
+
+        @SerializedName("codJfas")
         private String codJfas;
 
         public String getCodMdep() {

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java

@@ -1,12 +1,20 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
 import java.time.LocalDateTime;
 
 public class AuthenticationJwtResponseDTO {
 
+    @SerializedName("accessToken")
     private String accessToken;
+
+    @SerializedName("refreshToken")
     private String refreshToken;
+
+    @SerializedName("expiryDate")
     private LocalDateTime expiryDate;
+
+    @SerializedName("expireIn")
     private long expireIn;
 
 

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java

@@ -1,11 +1,22 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 public class LoginAziendaDTO {
 
+    @SerializedName("profileDb")
     private String profileDb;
+
+    @SerializedName("endpointRestApi")
     private String endpointRestApi;
+
+    @SerializedName("phpApi")
     private String phpApi;
+
+    @SerializedName("repoPhoto")
     private String repoPhoto;
+
+    @SerializedName("endpointPvm")
     private String endpointPvm;
 
     public String getProfileDb() {

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java

@@ -1,9 +1,16 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 public class LoginRequestDTO {
 
+    @SerializedName("username")
     private String username;
+
+    @SerializedName("password")
     private String password;
+
+    @SerializedName("deviceId")
     private String deviceId;
 
     public String getUsername() {

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java

@@ -1,12 +1,15 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.List;
 
 public class LoginResponseDTO {
 
+    @SerializedName("fullName")
     private String fullName;
-    private List<String> availableProfiles;
 
+    @SerializedName("availableProfiles")
+    private List<String> availableProfiles;
 
     public String getFullName() {
         return fullName;

app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java

@@ -1,6 +1,9 @@
 package it.integry.integrywmsnative.gest.login.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 public class RefreshRequestDTO {
+    @SerializedName("refreshToken")
     private String refreshToken;
 
     public String getRefreshToken() {

app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java

@@ -49,8 +49,12 @@ public class LoginViewModel {
 
                 FirebaseInstallations.getInstance().getId().addOnCompleteListener(fid -> {
 
+                    SettingsManager.i().createUserSession();
                     retrieveAvailableProfiles(protocol, host, port, username, password, selectedProfile -> {
-                        SettingsManager.i().createUserSession();
+                        if(selectedProfile == null) {
+                            this.sendOnLoadingEnded();
+                            return;
+                        }
 
                         authenticate(protocol, host, port, username, password, selectedProfile, fid.getResult(), fullName -> {
 
@@ -126,6 +130,8 @@ public class LoginViewModel {
     }
 
     private void authenticate(String protocol, String host, int port, String username, String password, String profileDb, String deviceSalt, RunnableArgs<String> onComplete) {
+
+
         mAuthenticationRESTConsumer.authenticate(protocol, host, port, username, password, profileDb, deviceSalt, sessionData -> {
 
             var claims = JwtUtils.parseJwt(sessionData.getAccessToken());

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -43,10 +43,10 @@ import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.model.MtbColr;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
@@ -806,7 +806,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     @Override
     public void onResume() {
         super.onResume();
-        Stream.of(this.mOrdiniInevasiMutableData)
+        this.mOrdiniInevasiMutableData.stream()
                 .forEach(x -> x.getSelectedObservable().set(false));
     }
 
@@ -842,7 +842,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
     @Override
-    public void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+    public void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts) {
         List<String> codMarts = Stream.of(sitArts)
                 .distinctBy(SitArtOrdDTO::getCodMart)
                 .map(SitArtOrdDTO::getCodMart)
@@ -862,7 +862,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 () -> SpedizioneActivity.startActivity(getActivity(),
                         sitArts,
                         orders,
-                        alreadyRegisteredMtbColts,
                         mCurrentGestioneCol,
                         mCurrentSegnoCol,
                         MtbColr.Causale.DEFAULT,

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java

@@ -23,9 +23,9 @@ import it.integry.integrywmsnative.core.exception.NoOrderFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.DtbOrdt;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -146,8 +146,7 @@ public class OrdiniUscitaElencoViewModel {
             List<SitArtOrdDTO> finalSitArts = sitArts;
 
             this.mOrdiniRESTConsumer.getBancaliGiaRegistrati(
-                    Stream.of(selectedOrdersBase).map(x -> (OrdineInevasoDTO) x).toList(),
+                    selectedOrdersBase.stream().map(x -> (OrdineInevasoDTO) x).collect(Collectors.toList()),
-                    mCurrentGestioneCol,
                     mCurrentSegnoCol,
                     mtbColtList -> {
                         this.sendOnOrdersDispatched(selectedOrdersBase, finalSitArts, mtbColtList);
@@ -303,7 +302,7 @@ public class OrdiniUscitaElencoViewModel {
         if (this.mListener != null) mListener.onOrderFiltered(filteredOrders);
     }
 
-    private void sendOnOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+    private void sendOnOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts) {
         if (this.mListener != null)
             mListener.onOrdersDispatched(orders, sitArts, alreadyRegisteredMtbColts);
     }
@@ -316,7 +315,7 @@ public class OrdiniUscitaElencoViewModel {
 
         void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders);
 
-        void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts);
+        void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java

@@ -446,7 +446,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         SpedizioneActivity.startActivity(getActivity(),
                 sitArtOrdDTOS,
                 new ArrayList<>(),
-                new ArrayList<>(),
                 GestioneEnum.LAVORAZIONE,
                 +1,
                 MtbColr.Causale.VERSAMENTO,

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFilterViewModel.java

@@ -21,7 +21,7 @@ public class ProdRientroMerceOrderListFilterViewModel {
 
     public void init(List<OrdineLavorazioneDTO> initialList) {
         this.initialOrderList = initialList;
-        this.currentFilteredOrderList.setValue(this.initialOrderList);
+        this.currentFilteredOrderList.postValue(this.initialOrderList);
     }
 
     public MutableLiveData<List<OrdineLavorazioneDTO>> getMutableFilteredOrderList() {

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java

@@ -252,7 +252,13 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
 
     @Override
     public void onItemDeleteRequest(VerificaGiacenzeRowEntity data) {
-        mViewModel.deleteRow(data);
+        executorService.execute(() -> {
+            try {
+                mViewModel.deleteRow(data);
+            } catch (Exception ex) {
+                onError(ex);
+            }
+        });
     }
 
 
@@ -317,12 +323,12 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         return result.get();
     }
 
-    public void saveAndClose() {
+    public void Close() {
         this.onLoadingStarted();
 
         executorService.execute(() -> {
             try {
-                mViewModel.save();
+                mViewModel.close();
                 this.onLoadingEnded();
 
                 popMe();

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java

@@ -8,7 +8,7 @@ import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
-import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 
@@ -16,8 +16,8 @@ import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 public class VerificaGiacenzeModule {
 
     @Provides
-    VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeMapper verificaGiacenzeMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+    VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeRowMapper verificaGiacenzeRowMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer);
+        return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeRowMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
@@ -23,14 +22,18 @@ import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRow
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
+import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
 import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.model.MtbAartBarCode;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
+import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
@@ -39,7 +42,7 @@ public class VerificaGiacenzeViewModel {
 
     private final ExecutorService executorService;
     private final Handler handler;
-    private final VerificaGiacenzeMapper verificaGiacenzeMapper;
+    private final VerificaGiacenzeRowMapper verificaGiacenzeRowMapper;
     private final GiacenzaPvRESTConsumer giacenzaPvRESTConsumer;
     private final VerificaGiacenzeRepository verificaGiacenzeRepository;
     private final VerificaGiacenzeRowRepository verificaGiacenzeRowRepository;
@@ -56,14 +59,14 @@ public class VerificaGiacenzeViewModel {
     @Inject
     public VerificaGiacenzeViewModel(ExecutorService executorService,
                                      Handler handler,
-                                     VerificaGiacenzeMapper verificaGiacenzeMapper,
+                                     VerificaGiacenzeRowMapper verificaGiacenzeRowMapper,
                                      GiacenzaPvRESTConsumer giacenzaPvRESTConsumer,
                                      VerificaGiacenzeRepository verificaGiacenzeRepository,
                                      VerificaGiacenzeRowRepository verificaGiacenzeRowRepository,
                                      ArticoloRESTConsumer articoloRESTConsumer) {
         this.executorService = executorService;
         this.handler = handler;
-        this.verificaGiacenzeMapper = verificaGiacenzeMapper;
+        this.verificaGiacenzeRowMapper = verificaGiacenzeRowMapper;
         this.giacenzaPvRESTConsumer = giacenzaPvRESTConsumer;
         this.verificaGiacenzeRepository = verificaGiacenzeRepository;
         this.verificaGiacenzeRowRepository = verificaGiacenzeRowRepository;
@@ -168,19 +171,17 @@ public class VerificaGiacenzeViewModel {
         return entity;
     }
 
-
+    public void close() throws Exception {
-    public void save() throws Exception {
         if (currentVerificaRows.getValue().isEmpty()) {
             delete();
             return;
         }
 
-        currentVerifica.getValue().setVerificaGiacenzeRowList(currentVerificaRows.getValue());
+        CloseVerificaRequestDTO request = new CloseVerificaRequestDTO()
+                .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep())
+                .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData());
 
-        SaveNewVerificaRequestDTO saveRequest = new SaveNewVerificaRequestDTO()
+        giacenzaPvRESTConsumer.closeVerifica(request);
-                .setData(verificaGiacenzeMapper.mapRoomToRest(currentVerifica.getValue()));
-
-        giacenzaPvRESTConsumer.saveNewVerificaSynchronized(saveRequest);
 
         delete();
     }
@@ -300,6 +301,19 @@ public class VerificaGiacenzeViewModel {
     }
 
     public void insertRow(VerificaGiacenzeRowEntity rowEntity) {
+        this.sendOnLoadingStarted();
+
+        var saveRequest = new SaveNewRowVerificaRequestDTO()
+                .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep())
+                .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData())
+                .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity));
+
+        try {
+            giacenzaPvRESTConsumer.saveNewRowSynchronized(saveRequest);
+        } catch (Exception e) {
+            this.sendError(e);
+        }
+
         verificaGiacenzeRowRepository.insert(rowEntity, insertedData -> {
             handler.post(() -> {
                 currentVerificaRows.getValue().add(insertedData);
@@ -309,6 +323,19 @@ public class VerificaGiacenzeViewModel {
     }
 
     public void updateRow(VerificaGiacenzeRowEntity rowEntity) {
+        this.sendOnLoadingStarted();
+
+        var updateRequest = new UpdateRowVerificaRequestDTO()
+                .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep())
+                .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData())
+                .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity));
+
+        try {
+            giacenzaPvRESTConsumer.updateRowSynchronized(updateRequest);
+        } catch (Exception e) {
+            this.sendError(e);
+        }
+
         var indexInList = -1;
 
         List<VerificaGiacenzeRowEntity> value = currentVerificaRows.getValue();
@@ -331,6 +358,19 @@ public class VerificaGiacenzeViewModel {
     }
 
     public void deleteRow(VerificaGiacenzeRowEntity rowEntity) {
+        this.sendOnLoadingStarted();
+
+        var deleteRequest = new DeleteRowVerificaRequestDTO()
+                .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep())
+                .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData())
+                .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity));
+
+        try {
+            giacenzaPvRESTConsumer.deleteRowSynchronized(deleteRequest);
+        } catch (Exception e) {
+            this.sendError(e);
+        }
+
         verificaGiacenzeRowRepository.delete(rowEntity, () -> {
 
             handler.post(() -> {
@@ -343,6 +383,7 @@ public class VerificaGiacenzeViewModel {
 
     private void notifyRowChanged() {
         currentVerificaRows.postValue(currentVerificaRows.getValue());
+        this.sendOnLoadingEnded();
     }
 
     private PickedQuantityDTO sendOnItemDispatched(MtbAart mtbAart,
@@ -373,7 +414,15 @@ public class VerificaGiacenzeViewModel {
             this.listener.onError(ex);
     }
 
-    public interface Listener {
+    private void sendOnLoadingStarted() {
+        if (this.listener != null) listener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.listener != null) listener.onLoadingEnded();
+    }
+
+    public interface Listener extends ILoadingListener {
         PickedQuantityDTO onItemDispatched(MtbAart mtbAart,
                                            BigDecimal initialNumCnf,
                                            BigDecimal initialQtaCnf,

app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java

@@ -19,6 +19,8 @@ import androidx.sqlite.db.SimpleSQLiteQuery;
 
 import com.annimon.stream.Stream;
 import com.google.android.material.snackbar.Snackbar;
+import com.google.firebase.crashlytics.CustomKeysAndValues;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.harrysoft.androidbluetoothserial.BluetoothManager;
 
 import java.io.BufferedReader;
@@ -31,7 +33,9 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -256,78 +260,98 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     private void exportLog() {
         var handler = new Handler(Looper.getMainLooper());
 
-        DialogYesNoView.newInstance("Esportazione log", "Vuoi inviare il log degli eventi al supporto?", result -> {
+        executorService.execute(() -> {
-                    if (result == DialogConsts.Results.NO || result == DialogConsts.Results.ABORT)
-                        return;
 
-                    this.openProgress();
+            if(!askConfirmToExportLog()) {
+                return;
+            }
 
-                    executorService.execute(() -> {
+            this.openProgress();
 
 
-                        File logFilePath = appContext.getLogFilePath();
+            File logFilePath = appContext.getLogFilePath();
-                        var files = logFilePath.listFiles();
+            var files = logFilePath.listFiles();
 
-                        var fileToShare = Arrays.stream(files)
+            var fileToShare = Arrays.stream(files)
-                                .sorted(Comparator.reverseOrder())
+                    .sorted(Comparator.reverseOrder())
-                                .findFirst()
+                    .findFirst()
-                                .orElse(null);
+                    .orElse(null);
-                        try {
+            try {
-                            List<MailAttachmentDTO> attachmentDTOList = new ArrayList<>();
+                List<MailAttachmentDTO> attachmentDTOList = new ArrayList<>();
 
-                            if (fileToShare != null) {
+                if (fileToShare != null) {
-                                var htmlContent = createAppLogAttachment(fileToShare);
+                    var htmlContent = createAppLogAttachment(fileToShare);
 
-                                byte[] buffer = htmlContent.getBytes();//specify the size to allow.
+                    byte[] buffer = htmlContent.getBytes();//specify the size to allow.
-                                String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
+                    String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
 
-                                var logAttachment = new MailAttachmentDTO()
+                    var logAttachment = new MailAttachmentDTO()
-                                        .setFileName("wms_log.html")
+                            .setFileName("wms_log.html")
-                                        .setFileb64Content(base64);
+                            .setFileb64Content(base64);
-                                attachmentDTOList.add(logAttachment);
+                    attachmentDTOList.add(logAttachment);
-                            }
+                }
 
 
-                            rawDao.vacuumDb(new SimpleSQLiteQuery("pragma wal_checkpoint(full)"));
+                rawDao.vacuumDb(new SimpleSQLiteQuery("pragma wal_checkpoint(full)"));
-                            File[] dbFiles = new File[3];
+                rawDao.vacuumDb(new SimpleSQLiteQuery("VACUUM;"));
-                            dbFiles[0] = requireContext().getDatabasePath("integry_wms");
+                File[] dbFiles = new File[3];
-                            dbFiles[1] = requireContext().getDatabasePath("integry_wms-shm");
+                dbFiles[0] = requireContext().getDatabasePath("integry_wms");
-                            dbFiles[2] = requireContext().getDatabasePath("integry_wms-wal");
+                dbFiles[1] = requireContext().getDatabasePath("integry_wms-shm");
+                dbFiles[2] = requireContext().getDatabasePath("integry_wms-wal");
 
-                            for (int i = 0; i < dbFiles.length; i++) {
+                for (int i = 0; i < dbFiles.length; i++) {
-                                byte[] dbFileBytes = new byte[(int) dbFiles[i].length()];
+                    byte[] dbFileBytes = new byte[(int) dbFiles[i].length()];
-                                FileInputStream inputStream = new FileInputStream(dbFiles[i]);
+                    FileInputStream inputStream = new FileInputStream(dbFiles[i]);
-                                final int read = inputStream.read(dbFileBytes);
+                    final int read = inputStream.read(dbFileBytes);
-                                inputStream.close();
+                    inputStream.close();
 
-                                var dbAttachment = new MailAttachmentDTO()
+                    var dbAttachment = new MailAttachmentDTO()
-                                        .setFileName(dbFiles[i].getName())
+                            .setFileName(dbFiles[i].getName())
-                                        .setFileb64Content(Base64.encodeToString(dbFileBytes, Base64.NO_WRAP));
+                            .setFileb64Content(Base64.encodeToString(dbFileBytes, Base64.NO_WRAP));
-                                attachmentDTOList.add(dbAttachment);
+                    attachmentDTOList.add(dbAttachment);
-                            }
+                }
 
-                            var mailRequest = new MailRequestDTO()
+                var mailRequest = new MailRequestDTO()
-                                    .setTo("developer@integry.it")
+                        .setTo("developer@integry.it")
-                                    .setMsgText("Questa è una mail contenente il log del WMS")
+                        .setMsgText("Questa è una mail contenente il log del WMS")
-                                    .setSubject("Internal WMS log")
+                        .setSubject("Internal WMS log")
-                                    .setAttachments(attachmentDTOList);
+                        .setAttachments(attachmentDTOList);
 
 
-                            systemRESTConsumer.sendMailSynchronized(mailRequest);
+                systemRESTConsumer.sendMailSynchronized(mailRequest);
 
-                            this.closeProgress();
+                this.closeProgress();
-                        } catch (Exception ex) {
+            } catch (Exception ex) {
-                            handler.post(() -> {
+                handler.post(() -> {
-                                this.closeProgress();
+                    FirebaseCrashlytics.getInstance().recordException(ex, new CustomKeysAndValues.Builder() {{
-                                UtilityExceptions.defaultException(requireContext(), ex);
+                        putString("ExportLog", "Error while exporting log");
-                            });
+                    }}.build());
-                        }
+                    this.closeProgress();
-                    });
+                    UtilityExceptions.defaultException(requireContext(), ex);
-                })
+                });
-                .show(getParentFragmentManager(), "tag");
+            }
+        });
     }
 
 
+    private boolean askConfirmToExportLog() {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicBoolean userConfirmed = new AtomicBoolean(false);
+
+        DialogYesNoView.newInstance("Esportazione log", "Vuoi inviare il log degli eventi al supporto?", result -> {
+            userConfirmed.set(result != DialogConsts.Results.NO && result != DialogConsts.Results.ABORT);
+            countDownLatch.countDown();
+        }).show(getParentFragmentManager(), "tag");
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        return userConfirmed.get();
+    }
+
     private void openProgress() {
 //        executorService.execute(() -> {
         this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -50,8 +51,10 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -120,7 +123,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     private ArrayList<SitArtOrdDTO> mSitArtOrd;
     private ArrayList<OrdineUscitaInevasoDTO> mTestateOrdini;
-    private ArrayList<MtbColt> mColliRegistrati;
+    private ArrayList<AlreadyRegisteredUlDTO> mColliRegistrati;
     private GestioneEnum mGestioneCol;
     private int mSegnoCol;
     private Integer mDefaultCausaleUL;
@@ -135,7 +138,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public static void startActivity(Context context,
                                      List<SitArtOrdDTO> ordini,
                                      List<OrdineUscitaInevasoDTO> selectedOrders,
-                                     List<MtbColt> mtbColtList,
                                      GestioneEnum gestioneCol,
                                      int segnoCol,
                                      Integer defaultCausaleUL,
@@ -149,9 +151,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         String keyTestateOrdini = DataCache.addItem(selectedOrders);
         myIntent.putExtra("keyTestateOrdini", keyTestateOrdini);
 
-        String keyColliRegistrati = DataCache.addItem(mtbColtList);
-        myIntent.putExtra("keyColliRegistrati", keyColliRegistrati);
-
         String keyGestioneCol = DataCache.addItem(gestioneCol);
         myIntent.putExtra("keyGestioneCol", keyGestioneCol);
 
@@ -176,7 +175,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
         mSitArtOrd = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList"));
         mTestateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini"));
-        mColliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati"));
         mGestioneCol = DataCache.retrieveItem(getIntent().getStringExtra("keyGestioneCol"));
         mSegnoCol = DataCache.retrieveItem(getIntent().getStringExtra("keySegnoCol"));
         mDefaultCausaleUL = DataCache.retrieveItem(getIntent().getStringExtra("keyDefaultCausaleCol"));
@@ -229,7 +227,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 canOverflowOrderQuantity,
                 mSitArtOrd,
                 mTestateOrdini,
-                mColliRegistrati,
                 mGestioneCol, mSegnoCol, mDefaultCausaleUL,
                 mEnableQuantityReset,
                 useQtaOrd,
@@ -822,25 +819,45 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     public void showCreatedUL() {
-        handler.post(() -> {
+        this.fabPopupMenu.dismiss();
-            this.fabPopupMenu.dismiss();
 
-            ArrayList<MtbColt> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
+        executorService.execute(() -> {
+            try {
+                ArrayList<AlreadyRegisteredUlDTO> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
 
-            Intent myIntent = ListaBancaliActivity.createIntent(this, createdMtbColts, true, false);
+                handler.post(() -> {
-            this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+                    Intent myIntent = ListaBancaliActivity.createIntent(this,
+
+                            createdMtbColts.stream()
+                                    .map(AlreadyRegisteredUlDTO::getMtbColt)
+                                    .collect(Collectors.toList()),
+
+                            input -> createdMtbColts.stream()
+                                    .filter(x -> x.getMtbColt().equals(input))
+                                    .findFirst()
+                                    .map(AlreadyRegisteredUlDTO::isCanBeRecovered)
+                                    .orElse(false),
+
+                            false,
+
+                            ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
+
+
+                    this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+                });
+            } catch (Exception e) {
+                onError(e);
+            }
         });
     }
 
 
     public void closeOrder() {
         this.fabPopupMenu.dismiss();
-        this.onLoadingStarted();
 
         executorService.execute(() -> {
             try {
                 this.mViewmodel.closeOrder();
-                this.onLoadingEnded();
             } catch (Exception e) {
                 onError(e);
             }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -50,6 +50,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
@@ -107,7 +108,6 @@ public class SpedizioneViewModel {
 
     private List<OrdineUscitaInevasoDTO> mTestateOrdini;
     private MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
-    private List<MtbColt> mColliRegistrati = new ArrayList<>();
     private List<MtbPartitaMag> mPartitaMagList = new ArrayList<>();
 
     private Listener mListener;
@@ -187,12 +187,11 @@ public class SpedizioneViewModel {
     }
 
 
-    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, List<MtbColt> colliRegistrati, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
+    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
         this.sendOnLoadingStarted();
 
         this.mDefaultCodMdep = codMdep;
         this.mTestateOrdini = testateOrdini;
-        this.mColliRegistrati = colliRegistrati;
         this.mEnableGiacenza = enableGiacenza;
         this.mEnableCheckPartitaMag = enableCheckPartitaMag;
         this.mCanOverflowOrderQuantity = canOverflowOrderQuantity;
@@ -342,14 +341,6 @@ public class SpedizioneViewModel {
         return mIsOrdTrasf;
     }
 
-    private void onOrderClosedPrintingDone() {
-        if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
-            this.sendCreateDocsRequest();
-        } else {
-            this.sendOnOrderClosed();
-        }
-
-    }
 
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();
@@ -1530,9 +1521,6 @@ public class SpedizioneViewModel {
                     .setMtbAart(null);
         }
 
-        var clonedTargetMtbColt = (MtbColt) mCurrentMtbColt.clone();
-        clonedTargetMtbColt.setMtbColr(null);
-
         var insertUDSRowRequestDto = new InsertUDSRowRequestDTO()
                 .setSourceMtbColr(clonedSourceMtbColr)
                 .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
@@ -1540,7 +1528,7 @@ public class SpedizioneViewModel {
                 .setQtaCnf(qtaCnf)
                 .setNumCnf(numCnf)
                 .setPartitaMag(partitaMag)
-                .setTargetMtbColt(clonedTargetMtbColt);
+                .setTargetMtbColt(mCurrentMtbColt.clone(false));
 
         if (dataScad != null)
             insertUDSRowRequestDto
@@ -1555,6 +1543,7 @@ public class SpedizioneViewModel {
             createdMtbColr = this.mColliScaricoRESTConsumer.insertUDSRowSynchronized(insertUDSRowRequestDto);
         } catch (Exception ex) {
             this.sendError(ex);
+            return;
         }
 
         pickingObjectDTO.getWithdrawMtbColrs().add(createdMtbColr);
@@ -1745,13 +1734,8 @@ public class SpedizioneViewModel {
 
             var positionedMtbColts = this.askPositionChange(filledMtbColts);
 
-
             this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts);
 
-            positionedMtbColts.stream()
-                    .filter(x -> !this.mColliRegistrati.contains(x))
-                    .forEach(x -> this.mColliRegistrati.add(x));
-
             postCloseOperations(positionedMtbColts);
 
             this.mIsNewLU = false;
@@ -2129,15 +2113,21 @@ public class SpedizioneViewModel {
     }
 
     public void closeOrder() {
+        this.sendOnLoadingStarted();
+
         if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
             var printRequestResult = this.sendOnCloseOrderPrintRequest();
-            this.onCloseOrderPrintRequest(printRequestResult);
+            this.onCloseOrderPrintRequested(printRequestResult);
         }
 
-        this.onOrderClosedPrintingDone();
+        if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
+            this.sendCreateDocsRequest();
+        }
+
+        this.sendOnOrderClosed();
     }
 
-    private void onCloseOrderPrintRequest(PrintOrderCloseDTO dto) {
+    private void onCloseOrderPrintRequested(PrintOrderCloseDTO dto) {
         if (!dto.isFlagPrintPackingList() && !dto.isFlagPrintSSCC()) {
             return;
         }
@@ -2153,13 +2143,22 @@ public class SpedizioneViewModel {
 
         dto.setPrintList(closedOrders);
 
+        CountDownLatch latch = new CountDownLatch(1);
+
         try {
             printClosedOrders(dto);
+            latch.countDown();
         } catch (Exception e) {
             this.sendLUPrintError(e, () -> {
+                latch.countDown();
             });
         }
 
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void printClosedOrders(PrintOrderCloseDTO dto) throws Exception {
@@ -2192,8 +2191,8 @@ public class SpedizioneViewModel {
         return mPartitaMagList;
     }
 
-    public ArrayList<MtbColt> getCreatedMtbColts() {
+    public ArrayList<AlreadyRegisteredUlDTO> getCreatedMtbColts() throws Exception {
-        return (ArrayList<MtbColt>) this.mColliRegistrati;
+        return (ArrayList<AlreadyRegisteredUlDTO>) this.mOrdiniRestConsumerService.getBancaliGiaRegistratiSynchronized(mTestateOrdini, mDefaultSegnoCol);
     }
 
     public VtbVett getDefaultVettore() {
@@ -2201,30 +2200,51 @@ public class SpedizioneViewModel {
     }
 
     void createDocs() {
-        var loadCollidto = new LoadColliDTO();
+        executorService.execute(() -> {
+            this.sendOnLoadingStarted();
+            List<MtbColt> registeredUds = null;
 
-        var codAnag = mTestateOrdini.stream()
+            try {
-                .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
+                var alreadyCreatedUds = getCreatedMtbColts();
-                .filter(Objects::nonNull)
+                registeredUds = alreadyCreatedUds.stream()
-                .distinct()
+                        .map(AlreadyRegisteredUlDTO::getMtbColt)
-                .findFirst()
+                        .collect(Collectors.toList());
-                .get();
+            } catch (Exception e) {
+                sendError(e);
+                return;
+            }
 
-        var codVdes = mTestateOrdini.stream().map(OrdineUscitaInevasoDTO::getCodVdes)
+            var loadCollidto = new LoadColliDTO();
-                .filter(Objects::nonNull)
-                .distinct()
-                .findFirst()
-                .get();
 
-        loadCollidto.setColli(getCreatedMtbColts());
+            var codAnag = mTestateOrdini.stream()
-        loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
+                    .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
-        loadCollidto.setCodMdep(mDefaultCodMdep);
+                    .filter(Objects::nonNull)
-        loadCollidto.setCodAnag(codAnag);
+                    .distinct()
-        loadCollidto.setCodVdes(codVdes);
+                    .findFirst()
-        loadCollidto.setSaveDoc(true);
+                    .get();
-        loadCollidto.setGestione("L");
 
-        this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError);
+            var codVdes = mTestateOrdini.stream()
+                    .map(OrdineUscitaInevasoDTO::getCodVdes)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .findFirst()
+                    .get();
+
+            loadCollidto.setColli(registeredUds);
+            loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
+            loadCollidto.setCodMdep(mDefaultCodMdep);
+            loadCollidto.setCodAnag(codAnag);
+            loadCollidto.setCodVdes(codVdes);
+            loadCollidto.setSaveDoc(true);
+            loadCollidto.setGestione("L");
+
+            try {
+                this.mDocumentRESTConsumer.makeSynchronousCreateDocFromColliRequest(loadCollidto);
+            } catch (Exception e) {
+                sendError(e);
+            }
+            this.sendOnLoadingEnded();
+        });
     }
 
     private Integer sendInputDuplicate() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/dto/DialogAskClienteClienteDTO.java

@@ -1,11 +1,17 @@
 package it.integry.integrywmsnative.view.dialogs.ask_cliente.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.util.ArrayList;
 
 public class DialogAskClienteClienteDTO {
 
+    @SerializedName("codAnag")
     private String codAnag;
+
+    @SerializedName("ragSoc")
     private String ragSoc;
+    @SerializedName("codJcoms")
     private ArrayList<String> codJcoms = new ArrayList<>();
 
     public String getCodAnag() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/dto/DialogAskClienteDestinatarioDTO.java

@@ -1,23 +1,34 @@
 package it.integry.integrywmsnative.view.dialogs.ask_cliente.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 import it.integry.integrywmsnative.core.model.VtbDest;
 
 public class DialogAskClienteDestinatarioDTO {
 
+
+    @SerializedName("codAnag")
     private String codAnag;
 
+    @SerializedName("codVdes")
     private String codVdes;
 
+    @SerializedName("destinatario")
     private String destinatario;
 
+    @SerializedName("indirizzo")
     private String indirizzo;
 
+    @SerializedName("cap")
     private String cap;
 
+    @SerializedName("citta")
     private String citta;
 
+    @SerializedName("prov")
     private String prov;
 
+    @SerializedName("nazione")
     private String nazione;
 
     public String getCodAnag() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java

@@ -2,14 +2,23 @@ package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
 
 import androidx.databinding.ObservableBoolean;
 import androidx.databinding.ObservableField;
+import com.google.gson.annotations.SerializedName;
 
 public class TracciamentoImballoDTO {
 
+    @SerializedName("codTcol")
     private final ObservableField<String> codTcol = new ObservableField<>();
+
+    @SerializedName("descrizione")
     private final ObservableField<String> descrizione = new ObservableField<>();
+
+    @SerializedName("codMart")
     private final ObservableField<String> codMart = new ObservableField<>();
+
+    @SerializedName("qta")
     private final ObservableField<Integer> qta = new ObservableField<>();
 
+    @SerializedName("editable")
     private final ObservableBoolean editable = new ObservableBoolean(true);
 
     public ObservableField<String> getCodTcol() {

app/src/main/res/layout/fragment_main.xml

@@ -6,6 +6,9 @@
         <variable
             name="view"
             type="it.integry.integrywmsnative.gest.main.MainFragment" />
+
+        <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
     </data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -137,6 +140,7 @@
                                         android:clickable="true"
                                         android:focusable="true"
                                         android:layout_alignParentEnd="true"
+                                        android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() ? View.VISIBLE : View.GONE}"
                                         android:onClick="@{() -> view.changeUserDepo()}"
                                         android:src="@drawable/ic_rounded_change_circle_24"
                                         android:tint="@android:color/white" />

app/src/main/res/layout/fragment_verifica_giacenze.xml

@@ -87,7 +87,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:singleClick="@{() -> view.saveAndClose()}"
+            app:singleClick="@{() -> view.Close()}"
             app:srcCompat="@drawable/ic_round_check_24"
             app:visibilityWhenNotNull="@{viewModel.currentVerifica}" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

barcode_base_android_library/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 35
+        targetSdk 36
 
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -36,5 +36,5 @@ configurations {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
 }

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '2.1.0'
-        agp_version = '8.10.0'
+        agp_version = '8.12.2'
     }
 
     repositories {

gradle.properties

@@ -14,18 +14,11 @@
 
 android.useAndroidX=true
 android.enableJetifier=true
-# android.enableSeparateAnnotationProcessing = true
-
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 
 
 
 # Enable Gradle Daemon
-org.gradle.daemon=true
+org.gradle.daemon=false
 # Enable Configure on demand
 org.gradle.configureondemand=true
 # Enable parallel builds
@@ -33,5 +26,5 @@ org.gradle.parallel=true
 # Enable simple gradle caching
 org.gradle.caching=true
 #  Increase memory allotted to JVM
-org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC -XX:MaxMetaspaceSize=512m
-org.gradle.unsafe.configuration-cache=true
+org.gradle.unsafe.configuration-cache=ON

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,74 +1,130 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
 
-APP_NAME="Gradle"
+# Resolve links: $0 may be a link
-APP_BASE_NAME=`basename "$0"`
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
+nonstop=false
-  CYGWIN* )
+case "$( uname )" in                #(
-    cygwin=true
+  CYGWIN* )         cygwin=true  ;; #(
-    ;;
+  Darwin* )         darwin=true  ;; #(
-  Darwin* )
+  MSYS* | MINGW* )  msys=true    ;; #(
-    darwin=true
+  NONSTOP* )        nonstop=true ;;
-    ;;
-  MINGW* )
-    msys=true
-    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,84 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Collect all arguments for the java command, stacking in reverse order:
-function splitJvmOpts() {
+#   * args from the command line
-    JVM_OPTS=("$@")
+#   * the main class name
-}
+#   * -classpath
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+#   * -D...appname settings
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -8,26 +26,30 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,54 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

honeywellscannerlibrary/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 35
+        targetSdk 36
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -38,6 +38,6 @@ dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
     implementation project(":honeywellsdk")
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation project(path: ':barcode_base_android_library')
 }

keyobardemulatorscannerlibrary/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 35
+        targetSdk 36
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -37,6 +37,6 @@ configurations {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation project(':barcode_base_android_library')
 }

pointmobilescannerlibrary/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 35
+        targetSdk 36
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -35,6 +35,6 @@ configurations {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation project(':barcode_base_android_library')
 }

zebrascannerlibrary/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 21
-        targetSdk 35
+        targetSdk 36
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,7 +37,7 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     testImplementation 'junit:junit:4.13.2'
     implementation project(path: ':barcode_base_android_library')
 }