fix scenario 1

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 8f80fe4..36da6ef 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -47,6 +47,7 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r

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

 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r


@@ -182,8 +183,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 fileSizeV.setVisibility(View.VISIBLE);\r
                 fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 fileSizeV.setVisibility(View.VISIBLE);\r
                 fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
                 lastModV.setVisibility(View.VISIBLE);\r

-                lastModV.setText(DateUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
-                        DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0));\r
+                lastModV.setText(showRelativeTimestamp(file));\r

                 // this if-else is needed even thoe fav icon is visible by default\r
                 // because android reuses views in listview\r
                 if (!file.keepInSync()) {\r
                 // this if-else is needed even thoe fav icon is visible by default\r
                 // because android reuses views in listview\r
                 if (!file.keepInSync()) {\r


@@ -251,8 +251,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 //                }\r
 
                 lastModV.setVisibility(View.VISIBLE);\r
 //                }\r
 
                 lastModV.setVisibility(View.VISIBLE);\r

-                lastModV.setText(DateUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
-                        DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0));\r
+                lastModV.setText(showRelativeTimestamp(file));\r

                 checkBoxV.setVisibility(View.GONE);\r
                 view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
 \r
                 checkBoxV.setVisibility(View.GONE);\r
                 view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
 \r


@@ -514,5 +513,15 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         mSortAscending = ascending;\r
         \r
         sortDirectory();\r
         mSortAscending = ascending;\r
         \r
         sortDirectory();\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
+    }

 }\r
 }\r