X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b23d07d8a134acf8a7632db6287376452739359f..32dadbcc6ca0de9924f216f81c6a124862ab3136:/src/com/owncloud/android/utils/DisplayUtils.java

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index f63d7ec4..e3c94f21 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -198,8 +198,13 @@ public class DisplayUtils {
         return fileExtension;
     }
 
+    public static CharSequence getRelativeTimestamp(Context context, OCFile file) {
+        return getRelativeDateTimeString(context, file.getModificationTimestamp(),
+                DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
+    }
+
     @SuppressWarnings("deprecation")
-    public static CharSequence getRelativeDateTimeString (
+    private static CharSequence getRelativeDateTimeString (
             Context c, long time, long minResolution, long transitionResolution, int flags
             ){
         
@@ -213,19 +218,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(",");
@@ -236,8 +229,8 @@ public class DisplayUtils {
                 return parts[1];
             }
         }
-        //dateString contains unexpected format. use localized, absolute date.
-        return DisplayUtils.unixTimeToHumanReadable(time);
+        //dateString contains unexpected format. fallback: use relative date time string from android api as is.
+        return dateString.toString();
     }
 
     /**