mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 22:55:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

return standard date string as fallback

Browse source
This commit is contained in:
Andy Scherzinger 2015-10-29 10:24:15 +01:00
parent e8eda963ae
commit 448124cc7e
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/com/owncloud/android/utils/DisplayUtils.java
View file

@ -193,19 +193,7 @@ public class DisplayUtils {
else if ((System.currentTimeMillis() - time) < 60 * 1000) {
return c.getString(R.string.file_list_seconds_ago);
} else {
// Workaround 2.x bug (see https://github.com/owncloud/android/issues/716)
if ( Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB &&
(System.currentTimeMillis() - time) > 24 * 60 * 60 * 1000 ) {
Date date = new Date(time);
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
dateString = DateUtils.getRelativeDateTimeString(
c, date.getTime(), minResolution, transitionResolution, flags
);
} else {
dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);
}
dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);
}
String[] parts = dateString.toString().split(",");
@ -217,7 +205,7 @@ public class DisplayUtils {
}
}
//dateString contains unexpected format. use localized, absolute date.
return DisplayUtils.unixTimeToHumanReadable(time);
return dateString.toString();
}
/**