< 60 seconds -> "seconds ago"

[pub/Android/ownCloud.git] / 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 682d2be..3d51f1f 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -18,6 +18,8 @@
 \r
 package com.owncloud.android.utils;\r
 \r
+import java.sql.Time;\r
+import java.text.SimpleDateFormat;\r
 import java.util.Arrays;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
@@ -25,7 +27,12 @@ import java.util.HashMap;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
+import android.content.Context;\r
+import android.text.format.DateFormat;\r
+import android.text.format.DateUtils;\r
+\r
 import com.owncloud.android.R;\r
+import com.owncloud.android.lib.common.utils.Log_OC;\r
 \r
 /**\r
  * A helper class for some string operations.\r
@@ -235,4 +242,15 @@ public class DisplayUtils {
             return R.drawable.icon;\r
         }\r
     }\r
+    \r
+    public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags){\r
+        if (time > System.currentTimeMillis()){\r
+            return DisplayUtils.unixTimeToHumanReadable(time);\r
+        } else if ((System.currentTimeMillis() - time) < 60000) {\r
+            return  c.getString(R.string.file_list_seconds_ago)  + ", " + \r
+                DateFormat.getTimeFormat(c).format(new Date(time));\r
+        } else {\r
+            return DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);\r
+        }\r
+    }\r
 }\r