Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 8a281e9..abbf44e 100644 (file)
--- 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);\r
             }\r
         }\r
-        \r
-        return dateString.toString().split(",")[0];\r
+\r
+        String[] parts = dateString.toString().split(",");\r
+        if (parts.length == 2) {\r
+            if(parts[0].contains(":") && !parts[1].contains(":")) {\r
+                return parts[1];\r
+            } else if(parts[1].contains(":") && !parts[0].contains(":")) {\r
+                return parts[0];\r
+            }\r
+        }\r
+        //dateString contains unexpected format. use localized, absolute date.\r
+        return DisplayUtils.unixTimeToHumanReadable(time);\r
     }\r
 \r
     /**\r