X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/476bfba9e4d52088fd479582fea86ce4924092aa..2117c024c4284c07fdb0a0a5673d0dd866eef5a0:/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 40bf1193..3d51f1f6 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -18,6 +18,8 @@
 
 package com.owncloud.android.utils;
 
+import java.sql.Time;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -25,9 +27,12 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import android.util.Log;
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 
 import com.owncloud.android.R;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 /**
  * A helper class for some string operations.
@@ -151,6 +156,7 @@ public class DisplayUtils {
      * known MIME type.
      * 
      * @param mimetype      MIME type string.
+     * @param filename      name, with extension
      * @return              Resource identifier of an image resource.
      */
     public static int getResourceId(String mimetype, String filename) {
@@ -236,4 +242,15 @@ public class DisplayUtils {
             return R.drawable.icon;
         }
     }
+    
+    public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags){
+        if (time > System.currentTimeMillis()){
+            return DisplayUtils.unixTimeToHumanReadable(time);
+        } else if ((System.currentTimeMillis() - time) < 60000) {
+            return  c.getString(R.string.file_list_seconds_ago)  + ", " + 
+                DateFormat.getTimeFormat(c).format(new Date(time));
+        } else {
+            return DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);
+        }
+    }
 }