From 95631069b8e646b9980e354ec8f7451cdb83acb6 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Mon, 9 Jan 2023 21:24:04 +0100 Subject: [PATCH] don't crash on unparseable date (#3129) --- .../keylesspalace/tusky/json/Rfc3339DateJsonAdapter.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/json/Rfc3339DateJsonAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/json/Rfc3339DateJsonAdapter.kt index 090fe5e37..c1241abcc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/json/Rfc3339DateJsonAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/json/Rfc3339DateJsonAdapter.kt @@ -16,6 +16,8 @@ */ package com.keylesspalace.tusky.json +import android.util.Log +import com.google.gson.JsonParseException import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken @@ -42,7 +44,12 @@ class Rfc3339DateJsonAdapter : TypeAdapter() { null } else -> { - reader.nextString().parseIsoDate() + try { + reader.nextString().parseIsoDate() + } catch (jpe: JsonParseException) { + Log.w("Rfc3339DateJsonAdapter", jpe) + null + } } } }