From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 15 Oct 2015 12:04:56 +0000 (+0200)
Subject: fix for #1192
X-Git-Tag: oc-android-1.9^2~38^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae6194ffee024b3267373b60f3baf81b3d8c4069?ds=inline;hp=-c

fix for #1192
---

ae6194ffee024b3267373b60f3baf81b3d8c4069
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);
     }
 
     /**