X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1efefbd22c21263f25034935e763672a378440ce..79cb6106fd3fc83aa84d18fb472788833b980ea8:/src/com/owncloud/android/utils/DisplayUtils.java?ds=inline

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 804a4dd0..cdd86836 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -27,7 +27,10 @@ import java.util.HashSet;
 import java.util.Set;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.os.Build;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
@@ -274,4 +277,15 @@ public class DisplayUtils {
             return url;
         }
     }
+    
+    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);
+        }
+    }
 }