From 250617f768ad4ef5f2e9a17e581ee6f812c691d6 Mon Sep 17 00:00:00 2001 From: Gius95 Date: Thu, 27 Dec 2018 14:40:02 +0100 Subject: [PATCH 1/3] Controllo per evitare eccezione in getDataScadPartita --- .../java/it/integry/integrywmsnative/core/model/MtbColr.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 09417cb2..238a8c25 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -10,6 +10,7 @@ import java.util.Date; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; +import it.integry.integrywmsnative.core.utility.UtilityString; public class MtbColr extends EntityBase implements Parcelable { @@ -535,7 +536,9 @@ public class MtbColr extends EntityBase implements Parcelable { public Date getDataScadPartitaD() { SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); try { - return sdf.parse(getDataScadPartitaS()); + if(!UtilityString.isNullOrEmpty(getDataScadPartitaS())) + return sdf.parse(getDataScadPartitaS()); + else return null; } catch (Exception ex) { UtilityLogger.errorMe(ex); return null; From 6bcca2b158bc08028d3c469b5d60305c087b3ccb Mon Sep 17 00:00:00 2001 From: Gius95 Date: Thu, 27 Dec 2018 14:40:49 +0100 Subject: [PATCH 2/3] Aggiornate librerie androidX --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c12d54c5..14f9c9d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'io.fabric.tools:gradle:1.+' + classpath 'io.fabric.tools:gradle:1.27.0' } } apply plugin: 'com.android.application' @@ -51,15 +51,15 @@ dependencies { implementation 'com.orhanobut:logger:2.2.0' implementation 'com.google.firebase:firebase-core:16.0.6' implementation 'com.google.firebase:firebase-crash:16.2.1' - implementation 'com.google.firebase:firebase-perf:16.2.2' - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7' + implementation 'com.google.firebase:firebase-perf:16.2.3' + implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' + implementation 'com.google.android.material:material:1.1.0-alpha02' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' - implementation 'androidx.preference:preference:1.1.0-alpha01' + implementation 'androidx.preference:preference:1.1.0-alpha02' implementation 'com.squareup.retrofit2:retrofit:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.0.0' implementation 'org.parceler:parceler-api:1.1.10' From 1668b562814e70a658f6ef2f93cb5fd9402fe771 Mon Sep 17 00:00:00 2001 From: Gius95 Date: Thu, 27 Dec 2018 14:41:28 +0100 Subject: [PATCH 3/3] -> v1.0.12 (15) --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a930b8531643bee38f8554afd5a28d42b5d6c895..af6a9970ae05b89391c13ac6fc07d39be3094924 100644 GIT binary patch delta 36 ucmV+<0NelA1=t0Um;~?T#0`<0wGg!JueCuw*kf`D6Q`35wqUbi0e1mUi4e2^ delta 36 ucmV+<0NelA1=t0Um;}c9U0;!$wGiy}ZDsT=$I$Z@;`5mV#%{A=0e1mt;}ZM; diff --git a/app/build.gradle b/app/build.gradle index 14f9c9d3..67b5a605 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "it.integry.integrywmsnative" minSdkVersion 21 targetSdkVersion 28 - versionCode 14 - versionName "1.0.11" + versionCode 15 + versionName "1.0.12" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }