diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d581433..f4a9fa0 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc..5f027c4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,22 +5,33 @@ diff --git a/build.gradle b/build.gradle index c6543e2..17b56e2 100644 --- 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/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java index 3b0d704..3a6e08d 100644 --- a/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java +++ b/simpleadapter/src/main/java/com/github/deckyfx/simpleadapter/parser/gson/DateTimeSerializer.java @@ -24,7 +24,9 @@ public class DateTimeSerializer implements JsonDeserializer, 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());