From 2d0bbf4b5340e9100949fce25d3d8e8774650501 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 12 Dec 2019 17:47:26 +0100 Subject: [PATCH] Fix cancellazione colli in fase di recupero non andato a buon fine --- .../core/data_recover/ColliDataRecover.java | 10 ---------- .../integrywmsnative/gest/main/MainFragment.java | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java index d8e564ed..41f64833 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java @@ -105,16 +105,6 @@ public class ColliDataRecover { return mtbColtsSessions.size() > 0; } - public static Integer getFirstSessionID() { - - if(thereIsAnExistantSession()){ - return 0; - - - } else return null; - - } - public static List getAllSessionIDs() { if(thereIsAnExistantSession()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 91f42d91..45a0e153 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -155,8 +155,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab cyclicRecover(sessionsIterator, onComplete, onFailed); }, ex -> { - if(ex.getMessage().contains("Dati collo non corretti")) { + if(ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) { ColliDataRecover.closeSession(recoveredMtbColtID); + onFailed.run(ex); } else { onFailed.run(ex); }