Allow GSON parse Date from blank string and null

deckyfx · Nov 23, 2018 · 0b11af8 · 0b11af8
1 parent a25dce0
commit 0b11af8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-rc02'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Additional libraries

diff --git a/...dapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java b/...dapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java
@@ -24,7 +24,9 @@ public class DateTimeSerializer implements JsonDeserializer<Date>, JsonSerialize
             "yyyy-MM-dd HH:mm:ss",
             "yyyy-MM-dd",
             "HH:mm:ss",
-            "timestamp"
+            "timestamp",
+            "blank",
+            "null"
     };
 
     @Override
@@ -35,6 +37,20 @@ public Date deserialize(JsonElement jsonElement, Type typeOF, JsonDeserializatio
                     return new Date(jsonElement.getAsLong());
                 } catch (Exception   e) {
                 }
+            } else if (format.equalsIgnoreCase("null")) {
+                try {
+                    if (jsonElement.getAsString() == null) {
+                        return null;
+                    }
+                } catch (Exception   e) {
+                }
+            } else if (format.equalsIgnoreCase("blank")) {
+                try {
+                    if (jsonElement.getAsString().length() == 0) {
+                        return null;
+                    }
+                } catch (Exception   e) {
+                }
             } else {
                 try {
                     return new SimpleDateFormat(format, Locale.US).parse(jsonElement.getAsString());