Merge branch 'develop' into nea_upload_files

diff --cc src/com/owncloud/android/utils/DisplayUtils.java
index f8e1acc,d8bf88f..da81f53
--- 1/src/com/owncloud/android/utils/DisplayUtils.java
--- 2/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@@ -274,21 -277,30 +277,47 @@@ public class DisplayUtils 
              return url;\r
          }\r
      }\r
 -    \r
 +\r
 +    /**\r
 +     * Get the file extension if it is on path as type "content://.../DocInfo.doc"\r
 +     * @param filepath: Content Uri converted to string format\r
 +     * @return String: fileExtension (type '.pdf'). Empty if no extension\r
 +     */\r
 +    public static String getComposedFileExtension(String filepath) {\r
 +        String fileExtension = "";\r
 +        String fileNameInContentUri = filepath.substring(filepath.lastIndexOf("/"));\r
 +\r
 +        // Check if extension is included in uri\r
 +        int pos = fileNameInContentUri.lastIndexOf('.');\r
 +        if (pos >= 0) {\r
 +            fileExtension = fileNameInContentUri.substring(pos);\r
 +        }\r
 +        return fileExtension;\r
 +    }\r
++\r
+     public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags){\r
+         CharSequence dateString = "";\r
+         \r
+         // in Future\r
+         if (time > System.currentTimeMillis()){\r
+             return DisplayUtils.unixTimeToHumanReadable(time);\r
+         } \r
+         // < 60 seconds -> seconds ago\r
+         else if ((System.currentTimeMillis() - time) < 60 * 1000) {\r
+             return c.getString(R.string.file_list_seconds_ago);\r
+         } else {\r
+             // Workaround 2.x bug (see https://github.com/owncloud/android/issues/716)\r
+             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB && (System.currentTimeMillis() - time) > 24 * 60 * 60 * 1000){\r
+                 Date date = new Date(time);\r
+                 date.setHours(0);\r
+                 date.setMinutes(0);\r
+                 date.setSeconds(0);\r
+                 dateString = DateUtils.getRelativeDateTimeString(c, date.getTime(), minResolution, transitionResolution, flags);\r
+             } else {\r
+                 dateString = DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);\r
+             }\r
+         }\r
+         \r
 -        return dateString.toString().split(",")[0];\r
++        return dateString.toString().split(",")[0];
+     }\r
  }\r