diff --git a/app/build.gradle b/app/build.gradle index 8553d972..15011a2f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 483 - def appVersionName = '1.45.01' + def appVersionCode = 484 + def appVersionName = '1.45.02' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java index 2c0b9f60..53ac380c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.gest.spedizione; +import android.os.Handler; + import java.util.concurrent.ExecutorService; import dagger.Module; @@ -41,7 +43,8 @@ public class SpedizioneModule { MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, MagazzinoRESTConsumer magazzinoRESTConsumer, - ExecutorService executorService) { + ExecutorService executorService, + Handler handler) { return new SpedizioneViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliDataRecoverService, @@ -55,7 +58,8 @@ public class SpedizioneModule { magazzinoAutomaticoRESTConsumer, imballiRESTConsumer, magazzinoRESTConsumer, - executorService); + executorService, + handler); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 50c5120f..74838ef2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.spedizione; import android.os.Handler; -import android.os.Looper; import android.util.Pair; import androidx.databinding.ObservableArrayList; @@ -148,11 +147,11 @@ public class SpedizioneViewModel { private final ImballiRESTConsumer mImballiRESTConsumer; private final ExecutorService executorService; + private final Handler handler; private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer; private MagazzinoRESTConsumer magazzinoRESTConsumer; - private Handler handler = new Handler(Looper.getMainLooper()); @Inject public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, @@ -168,7 +167,8 @@ public class SpedizioneViewModel { MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, MagazzinoRESTConsumer magazzinoRESTConsumer, - ExecutorService executorService) { + ExecutorService executorService, + Handler handler) { this.mArticoloRESTConsumer = articoloRESTConsumer; this.mBarcodeRESTConsumer = barcodeRESTConsumer; this.mColliDataRecoverService = colliDataRecoverService; @@ -183,6 +183,7 @@ public class SpedizioneViewModel { this.mImballiRESTConsumer = imballiRESTConsumer; this.magazzinoRESTConsumer = magazzinoRESTConsumer; this.executorService = executorService; + this.handler = handler; } @@ -2094,12 +2095,14 @@ public class SpedizioneViewModel { } public void resetMatchedRows() { - for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) { - pickingObjectDTO.setTempPickData(null).setHidden(false); - } + handler.post(() -> { + for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) { + pickingObjectDTO.setTempPickData(null).setHidden(false); + } - this.mPickingList.postValue(this.mPickingList.getValue()); - this.sendFilterRemoved(); + this.mPickingList.postValue(this.mPickingList.getValue()); + this.sendFilterRemoved(); + }); } public void closeOrder() {