X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0a394622102758bc666ba3189bfe9410ca72dd27..e901b609baa4dd5f681e2a5257c9e504997e3377:/src/com/owncloud/android/utils/DisplayUtils.java

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 8c4c492b..da81f539 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -27,8 +27,12 @@ import java.util.HashSet;
 import java.util.Set;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.os.Build;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 /**
@@ -39,6 +43,8 @@ import com.owncloud.android.R;
  */
 public class DisplayUtils {
     
+    private static final String OWNCLOUD_APP_NAME = "ownCloud";
+
     //private static String TAG = DisplayUtils.class.getSimpleName(); 
     
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
@@ -233,7 +239,8 @@ public class DisplayUtils {
     
     
     public static int getSeasonalIconId() {
-        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) {
+        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354 &&
+                MainApp.getAppContext().getString(R.string.app_name).equals(OWNCLOUD_APP_NAME)) {
             return R.drawable.winter_holidays_icon;
         } else {
             return R.drawable.icon;
@@ -270,4 +277,47 @@ public class DisplayUtils {
             return url;
         }
     }
+
+    /**
+     * Get the file extension if it is on path as type "content://.../DocInfo.doc"
+     * @param filepath: Content Uri converted to string format
+     * @return String: fileExtension (type '.pdf'). Empty if no extension
+     */
+    public static String getComposedFileExtension(String filepath) {
+        String fileExtension = "";
+        String fileNameInContentUri = filepath.substring(filepath.lastIndexOf("/"));
+
+        // Check if extension is included in uri
+        int pos = fileNameInContentUri.lastIndexOf('.');
+        if (pos >= 0) {
+            fileExtension = fileNameInContentUri.substring(pos);
+        }
+        return fileExtension;
+    }
+
+    public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags){
+        CharSequence dateString = "";
+        
+        // in Future
+        if (time > System.currentTimeMillis()){
+            return DisplayUtils.unixTimeToHumanReadable(time);
+        } 
+        // < 60 seconds -> seconds ago
+        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);
+            }
+        }
+        
+        return dateString.toString().split(",")[0];
+    }
 }