From ae6194ffee024b3267373b60f3baf81b3d8c4069 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 15 Oct 2015 14:04:56 +0200 Subject: [PATCH] fix for #1192 --- src/com/owncloud/android/utils/DisplayUtils.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java index 8a281e92..abbf44ee 100644 --- a/src/com/owncloud/android/utils/DisplayUtils.java +++ b/src/com/owncloud/android/utils/DisplayUtils.java @@ -207,8 +207,17 @@ public class DisplayUtils { dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags); } } - - return dateString.toString().split(",")[0]; + + String[] parts = dateString.toString().split(","); + if (parts.length == 2) { + if(parts[0].contains(":") && !parts[1].contains(":")) { + return parts[1]; + } else if(parts[1].contains(":") && !parts[0].contains(":")) { + return parts[0]; + } + } + //dateString contains unexpected format. use localized, absolute date. + return DisplayUtils.unixTimeToHumanReadable(time); } /** -- 2.11.0