From f4f850303717346927f90a2f80b9c23b6d9a7e70 Mon Sep 17 00:00:00 2001 From: davidoskky Date: Fri, 19 Mar 2021 17:24:25 +0100 Subject: [PATCH] Check new date format in items. --- .../apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt index 2f7c562..372a4b8 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt @@ -21,8 +21,14 @@ fun String.toTextDrawableString(c: Context): String { fun Item.sourceAndDateText(): String { val formattedDate: String = try { + var date = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(this.datetime) + // Api 3.0 changes the date format, check for ISO8601 format + if (date == null) { + date = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").parse(this.datetime) + } + " " + DateUtils.getRelativeTimeSpanString( - SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(this.datetime).time, + date.time, Date().time, DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE