diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a930b853..af6a9970 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index c12d54c5..67b5a605 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' @@ -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" } @@ -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' 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;