From 8492b09db15efbeadfdf27f39896ab4db8b279e4 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 18 Aug 2020 11:49:03 +0200 Subject: [PATCH 1/2] aggiunto controllo errore recupero sull'update della data fine collo --- .../integrywmsnative/gest/main/MainFragment.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 37d486a1..3e7ae338 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 @@ -170,7 +170,17 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab cyclicRecover(sessionsIterator, onComplete, onFailed); }); - }, onFailed); + }, ex -> { + + if(ex.getMessage().contains("Dati entity mtb_colt non trovati") || 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); + } + + cyclicRecover(sessionsIterator, onComplete, onFailed); + }); } else { ColliDataRecover.closeSession(recoveredMtbColtID); cyclicRecover(sessionsIterator, onComplete, onFailed); From 08d233b84ed894c6b87306e56e9b2942e7f1a9af Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 18 Aug 2020 11:49:57 +0200 Subject: [PATCH 2/2] -> v1.12.17 (146) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4381de70..39498dec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 145 - def appVersionName = '1.12.16' + def appVersionCode = 146 + def appVersionName = '1.12.17' signingConfigs { release {