[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / FileStorageUtils.java

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index de1a320..e70302f 100644 (file)
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2013 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -36,12 +39,11 @@ import android.preference.PreferenceManager;
 import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;
 import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;

+import android.webkit.MimeTypeMap;

 
 
 /**
  * Static methods to help in access to local file system.
 
 
 /**
  * Static methods to help in access to local file system.

- * 
- * @author David A. Velasco

  */
 public class FileStorageUtils {
     public static Integer mSortOrder;
  */
 public class FileStorageUtils {
     public static Integer mSortOrder;


@@ -93,6 +95,20 @@ public class FileStorageUtils {
         String value = uploadPath + OCFile.PATH_SEPARATOR +  (fileName == null ? "" : fileName);
         return value;
     }
         String value = uploadPath + OCFile.PATH_SEPARATOR +  (fileName == null ? "" : fileName);
         return value;
     }

+
+    /**
+     * Gets the composed path when video is or must be stored
+     * @param context
+     * @param fileName: video file name
+     * @return String: video file path composed
+     */
+    public static String getInstantVideoUploadFilePath(Context context, String fileName) {
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+        String uploadVideoPathdef = context.getString(R.string.instant_upload_path);
+        String uploadVideoPath = pref.getString("instant_video_upload_path", uploadVideoPathdef);
+        String value = uploadVideoPath + OCFile.PATH_SEPARATOR +  (fileName == null ? "" : fileName);
+        return value;
+    }

     
     public static String getParentPath(String remotePath) {
         String parentPath = new File(remotePath).getParent();
     
     public static String getParentPath(String remotePath) {
         String parentPath = new File(remotePath).getParent();


@@ -121,7 +137,7 @@ public class FileStorageUtils {
     /**
      * Creates and populates a new {@link RemoteFile} object with the data read from an {@link OCFile}.
      * 
     /**
      * Creates and populates a new {@link RemoteFile} object with the data read from an {@link OCFile}.
      * 

-     * @param oCFile    OCFile 
+     * @param ocFile    OCFile

      * @return          New RemoteFile instance representing the resource described by ocFile.
      */
     public static RemoteFile fillRemoteFile(OCFile ocFile){
      * @return          New RemoteFile instance representing the resource described by ocFile.
      */
     public static RemoteFile fillRemoteFile(OCFile ocFile){


@@ -139,7 +155,7 @@ public class FileStorageUtils {
     /**
      * Sorts all filenames, regarding last user decision 
      */
     /**
      * Sorts all filenames, regarding last user decision 
      */

-    public static Vector<OCFile> sortDirectory(Vector<OCFile> files){
+    public static Vector<OCFile> sortFolder(Vector<OCFile> files){

         switch (mSortOrder){
         case 0:
             files = FileStorageUtils.sortByName(files);
         switch (mSortOrder){
         case 0:
             files = FileStorageUtils.sortByName(files);


@@ -157,7 +173,7 @@ public class FileStorageUtils {
     
     /**
      * Sorts list by Date
     
     /**
      * Sorts list by Date

-     * @param sortAscending true: ascending, false: descending
+     * @param files

      */
     public static Vector<OCFile> sortByDate(Vector<OCFile> files){
         final Integer val;
      */
     public static Vector<OCFile> sortByDate(Vector<OCFile> files){
         final Integer val;


@@ -225,7 +241,7 @@ public class FileStorageUtils {
 
     /**
      * Sorts list by Name
 
     /**
      * Sorts list by Name

-     * @param sortAscending true: ascending, false: descending
+     * @param files     files to sort

      */
     public static Vector<OCFile> sortByName(Vector<OCFile> files){
         final Integer val;
      */
     public static Vector<OCFile> sortByName(Vector<OCFile> files){
         final Integer val;


@@ -270,6 +286,21 @@ public class FileStorageUtils {
             return result;
         }
         return 0;
             return result;
         }
         return 0;

-    } 
+    }
+
+    /**
+     * Mimetype String of a file
+     * @param path
+     * @return
+     */
+    public static String getMimeTypeFromName(String path) {
+        String extension = "";
+        int pos = path.lastIndexOf('.');
+        if (pos >= 0) {
+            extension = path.substring(pos + 1);
+        }
+        String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
+        return (result != null) ? result : "";
+    }

   
 }
   
 }