< 60 seconds -> "seconds ago"

diff --git a/res/values/strings.xml b/res/values/strings.xml
index af5a684..65ffc63 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>

+    <string name="file_list_seconds_ago">seconds ago</string>

     <string name="file_list_empty">Nothing in here. Upload something!</string>
     <string name="file_list_loading">Loading...</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>
     <string name="file_list_empty">Nothing in here. Upload something!</string>
     <string name="file_list_loading">Loading...</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 36da6ef..8283f36 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -516,12 +516,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     }    \r
     \r
     private CharSequence showRelativeTimestamp(OCFile file){\r
     }    \r
     \r
     private CharSequence showRelativeTimestamp(OCFile file){\r

-        Log_OC.d("Timestamp", "File: " + file.getModificationTimestamp() + " system: " + System.currentTimeMillis());\r
-        if (file.getModificationTimestamp() > System.currentTimeMillis()){\r
-            return DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp());\r
-        } else {\r
-            return DateUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
-                    DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
-        }\r
+        return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
+                DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r

     }
 }\r
     }
 }\r

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
 \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
 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 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.R;\r

+import com.owncloud.android.lib.common.utils.Log_OC;\r

 \r
 /**\r
  * A helper class for some string operations.\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
             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
 }\r