Finish v1.41.08(456)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 453
+    def appVersionCode = 456
-    def appVersionName = '1.41.05'
+    def appVersionName = '1.41.08'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java

@@ -53,16 +53,16 @@ public class BaseActivity extends AppCompatActivity {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
             this.mCurrentProgress.show(getSupportFragmentManager());
-        });
+        //});
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+        //executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
-        });
+        //});
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java

@@ -77,22 +77,23 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 
     public void onError(Exception ex) {
+        this.onLoadingEnded();
+
         requireActivity().runOnUiThread(() -> {
-            this.onLoadingEnded();
             UtilityExceptions.defaultException(requireActivity(), ex);
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java

@@ -66,16 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
-        });
+//        });
     }
 
     public void onError(Exception ex) {

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

@@ -17,7 +17,6 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.OrdineDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
@@ -42,17 +41,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -66,17 +61,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -105,7 +96,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
+//                            UtilityThread.executeParallel(() -> {
 //                                if (data == null) {
 //                                    onFailed.run(new Exception("Nessun ordine generato"));
 //                                    return;
@@ -117,7 +108,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 //                                ordine.setCodMdep(data.getCodMdep());
 //                                ordine.setNumOrd(data.getNumOrd());
                                 onSuccess.run(ordine);
-                            }, false);
+//                            }, false);
                         }, onFailed);
                     }
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java

@@ -130,8 +130,10 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
         this.onLoadingStarted();
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
         pvOrdiniAcquistoRESTConsumer.retrieveArticoli(codAlis, codMdep, dto -> {
+
             this.onLoadingEnded();
-            if (dto.getArticoli().size() == 0) {
+
+            if (dto.getArticoli().isEmpty()) {
                 if (UtilityString.isNullOrEmpty(codAlis)) {
                     onFailed.run(new NoArtsFoundException());
                 } else {
@@ -146,6 +148,7 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
             mGriglia.setDescrDepo(dto.getDescrDepo());
             mListArticoli = dto.getArticoli();
             this.dismiss();
+
         }, onFailed);
     }
 

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

@@ -309,15 +309,15 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
 
     private void openProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
             this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-        });
+//        });
     }
 
     private void closeProgress() {
-        executorService.execute(() -> {
+//        executorService.execute(() -> {
-            mCurrentProgress.dismissAllowingStateLoss();
+            mCurrentProgress.dismiss();
-        });
+//        });
     }
 
 

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
-import androidx.annotation.IntegerRes;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -11,18 +10,15 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.EmptyLUException;
@@ -89,7 +85,6 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
-import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.CurrentMonoLUPositionIsNotCorrectException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidMagazzinoAutomaticoMovementException;
@@ -99,7 +94,6 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
 
 public class SpedizioneViewModel {
@@ -193,19 +187,20 @@ public class SpedizioneViewModel {
         this.mUseQtaOrd = useQtaOrd;
         this.mUseColliPedana = useColliPedana;
 
-        if (enableGiacenza) {
-            mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
-                this.mPickingList.postValue(pickingObjectList);
-            }, ex -> this.sendError(new OrdersLoadException(ex)));
-        } else {
-            getEmptyPickingList(pickingList, pickingObjectList -> {
-                this.mPickingList.postValue(pickingObjectList);
-            });
-        }
-
         getPartitaMagList(pickingList, mtbPartitaMagList -> {
             this.mPartitaMagList = mtbPartitaMagList;
-            this.sendOnLoadingEnded();
+
+            if (enableGiacenza) {
+                mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
+                    this.mPickingList.postValue(pickingObjectList);
+                    this.sendOnLoadingEnded();
+                }, ex -> this.sendError(new OrdersLoadException(ex)));
+            } else {
+                getEmptyPickingList(pickingList, pickingObjectList -> {
+                    this.mPickingList.postValue(pickingObjectList);
+                    this.sendOnLoadingEnded();
+                });
+            }
         });
 
         this.mDefaultGestioneOfUL = gestioneCol;

app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java

@@ -64,7 +64,7 @@ public class DialogProgressView extends DialogFragment {
     }
 
     public void show(@NonNull FragmentManager manager) {
-        if (!isAdded() && !isInLayout()) {
+        if (!isAdded() && !isInLayout() && !progressOpened) {
             this.progressOpened = true;
             super.show(manager, "loading-dialog");
         }
@@ -72,7 +72,7 @@ public class DialogProgressView extends DialogFragment {
 
     @Override
     public void dismiss() {
-        if (isAdded() || isInLayout()) {
+        if (isAdded() || isInLayout() || progressOpened) {
             this.progressOpened = false;
             super.dismissAllowingStateLoss();
         }

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.7.1'
+        agp_version = '8.7.2'
     }
 
     repositories {