Finish v1.47.09(522)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 519
+    def appVersionCode = 522
-    def appVersionName = '1.47.06'
+    def appVersionName = '1.47.09'
 
     signingConfigs {
         release {
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdk 36
         versionCode appVersionCode
         versionName appVersionName
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -53,11 +53,11 @@ android {
             ext.enableCrashlytics = false
 //            minifyEnabled true // Abilita la minimizzazione del codice
 //            shrinkResources true // Rimuove risorse non utilizzate
-//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
-//            minifyEnabled true // Abilita la minimizzazione del codice
+            minifyEnabled true // Abilita la minimizzazione del codice
-//            shrinkResources true // Rimuove risorse non utilizzate
+            shrinkResources true // Rimuove risorse non utilizzate
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
@@ -91,7 +91,7 @@ android {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-    compileSdk 35
+    compileSdk 36
 }
 
 configurations {
@@ -110,18 +110,18 @@ dependencies {
     implementation 'com.github.lupaulus:logger:2.3.2'
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:33.14.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 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -134,14 +134,14 @@ dependencies {
     }
 
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
+    implementation 'com.squareup.retrofit2:retrofit:3.0.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
+    implementation 'com.squareup.retrofit2:converter-gson:3.0.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'
     implementation "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     implementation "com.google.dagger:dagger-android:$dagger2_version"
@@ -157,7 +157,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"
@@ -183,8 +183,8 @@ 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'
 
     //Barcode generator
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'

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/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/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/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/login/viewmodel/LoginViewModel.java

@@ -49,8 +49,12 @@ public class LoginViewModel {
 
                 FirebaseInstallations.getInstance().getId().addOnCompleteListener(fid -> {
 
-                    retrieveAvailableProfiles(protocol, host, port, username, password, selectedProfile -> {
                     SettingsManager.i().createUserSession();
+                    retrieveAvailableProfiles(protocol, host, port, username, password, selectedProfile -> {
+                        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/settings/MainSettingsFragment.java

@@ -33,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;
@@ -258,14 +260,14 @@ 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)
+
+            if(!askConfirmToExportLog()) {
                 return;
+            }
 
             this.openProgress();
 
-                    executorService.execute(() -> {
-
 
             File logFilePath = appContext.getLogFilePath();
             var files = logFilePath.listFiles();
@@ -291,6 +293,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
 
                 rawDao.vacuumDb(new SimpleSQLiteQuery("pragma wal_checkpoint(full)"));
+                rawDao.vacuumDb(new SimpleSQLiteQuery("VACUUM;"));
                 File[] dbFiles = new File[3];
                 dbFiles[0] = requireContext().getDatabasePath("integry_wms");
                 dbFiles[1] = requireContext().getDatabasePath("integry_wms-shm");
@@ -328,11 +331,27 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                 });
             }
         });
-                })
-                .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/SpedizioneViewModel.java

@@ -1521,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())
@@ -1531,7 +1528,7 @@ public class SpedizioneViewModel {
                 .setQtaCnf(qtaCnf)
                 .setNumCnf(numCnf)
                 .setPartitaMag(partitaMag)
-                .setTargetMtbColt(clonedTargetMtbColt);
+                .setTargetMtbColt(mCurrentMtbColt.clone(false));
 
         if (dataScad != null)
             insertUDSRowRequestDto
@@ -1546,6 +1543,7 @@ public class SpedizioneViewModel {
             createdMtbColr = this.mColliScaricoRESTConsumer.insertUDSRowSynchronized(insertUDSRowRequestDto);
         } catch (Exception ex) {
             this.sendError(ex);
+            return;
         }
 
         pickingObjectDTO.getWithdrawMtbColrs().add(createdMtbColr);

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.11.1'
+        agp_version = '8.12.2'
     }
 
     repositories {

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')
 }