<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>
import android.content.SharedPreferences;\r
import android.graphics.Bitmap;\r
import android.preference.PreferenceManager;\r
+import android.text.format.DateUtils;\r
import android.view.LayoutInflater;\r
import android.view.View;\r
import android.view.ViewGroup;\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
fileSizeV.setVisibility(View.VISIBLE);\r
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
lastModV.setVisibility(View.VISIBLE);\r
- lastModV.setText(\r
- DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp())\r
- );\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
// }\r
lastModV.setVisibility(View.VISIBLE);\r
- lastModV.setText(\r
- DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp())\r
- );\r
+ lastModV.setText(showRelativeTimestamp(file));\r
checkBoxV.setVisibility(View.GONE);\r
view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
\r
mSortAscending = ascending;\r
\r
sortDirectory();\r
- }
+ } \r
+ \r
+ private CharSequence showRelativeTimestamp(OCFile file){\r
+ return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
+ DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
+ }
}\r
import java.util.Set;\r
\r
import android.annotation.TargetApi;\r
+import android.content.Context;\r
import android.os.Build;\r
+import android.text.format.DateFormat;\r
+import android.text.format.DateUtils;\r
\r
import com.owncloud.android.MainApp;\r
import com.owncloud.android.R;\r
return url;\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