From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 29 Oct 2015 09:24:15 +0000 (+0100)
Subject: return standard date string as fallback
X-Git-Tag: oc-android-1.9^2~38^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/448124cc7e404b56a6696d55889ffaa170782397?ds=inline;hp=--cc

return standard date string as fallback
---

448124cc7e404b56a6696d55889ffaa170782397
diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index ff6cd8b0..9fe9b48c 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -193,19 +193,7 @@ public class DisplayUtils {
         else if ((System.currentTimeMillis() - time) < 60 * 1000) {
             return c.getString(R.string.file_list_seconds_ago);
         } else {
-            // Workaround 2.x bug (see https://github.com/owncloud/android/issues/716)
-            if (    Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB && 
-                    (System.currentTimeMillis() - time) > 24 * 60 * 60 * 1000   ) {
-                Date date = new Date(time);
-                date.setHours(0);
-                date.setMinutes(0);
-                date.setSeconds(0);
-                dateString = DateUtils.getRelativeDateTimeString(
-                        c, date.getTime(), minResolution, transitionResolution, flags
-                );
-            } else {
-                dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);
-            }
+            dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);
         }
 
         String[] parts = dateString.toString().split(",");
@@ -217,7 +205,7 @@ public class DisplayUtils {
             }
         }
         //dateString contains unexpected format. use localized, absolute date.
-        return DisplayUtils.unixTimeToHumanReadable(time);
+        return dateString.toString();
     }
 
     /**