-/* 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,
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.
- *
- * @author David A. Velasco
*/
public class FileStorageUtils {
public static Integer mSortOrder;
public static final Integer SORT_NAME = 0;
public static final Integer SORT_DATE = 1;
public static final Integer SORT_SIZE = 2;
-
-
- //private static final String LOG_TAG = "FileStorageUtils";
+
+
+ //private static final String TAG = FileStorageUtils.class.getSimpleName();
+
+ @SuppressLint("NewApi")
+ private static final File getBaseStorePath() {
+ File baseStoragePath = Environment.getExternalStorageDirectory();
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+ File[] dirs = MainApp.getAppContext().getExternalFilesDirs(null);
+ if (dirs.length > 1) {
+ baseStoragePath = dirs[1];
+ }
+ }
+ return baseStoragePath;
+ }
+
+ @SuppressLint("NewApi")
+ private static final String getBaseStorePathString() {
+ File baseStoragePath = Environment.getExternalStorageDirectory();
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+ File[] dirs = MainApp.getAppContext().getExternalFilesDirs(null);
+ if (dirs.length > 1) {
+ baseStoragePath = dirs[1];
+ }
+ return baseStoragePath.getAbsolutePath();
+ } else {
+ return baseStoragePath.getAbsolutePath() + "/" + MainApp.getDataFolder();
+ }
+ }
+
public static final String getSavePath(String accountName) {
- File sdCard = Environment.getExternalStorageDirectory();
- return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
+ //File sdCard = Environment.getExternalStorageDirectory();
+ //return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
// URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
+ //return getBaseStorePath().getAbsolutePath() + "/" + Uri.encode(accountName, "@");
+ return getBaseStorePathString() + "/" + Uri.encode(accountName, "@");
}
public static final String getDefaultSavePathFor(String accountName, OCFile file) {
}
public static final String getTemporalPath(String accountName) {
- File sdCard = Environment.getExternalStorageDirectory();
- return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
+ //File sdCard = Environment.getExternalStorageDirectory();
+ //return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
// URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
+ //return getBaseStorePath().getAbsolutePath() + "/tmp/" + Uri.encode(accountName, "@");
+ return getBaseStorePathString() + "/tmp/" + Uri.encode(accountName, "@");
}
@SuppressLint("NewApi")
public static final long getUsableSpace(String accountName) {
- File savePath = Environment.getExternalStorageDirectory();
+ //File savePath = Environment.getExternalStorageDirectory();
+ File savePath = getBaseStorePath();
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) {
return savePath.getUsableSpace();
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();
file.setRemoteId(remote.getRemoteId());
return file;
}
-
+
/**
* 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){
file.setRemoteId(ocFile.getRemoteId());
return file;
}
-
+
/**
- * 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);
case 1:
files = FileStorageUtils.sortByDate(files);
break;
- case 2:
+ case 2:
// mFiles = FileStorageUtils.sortBySize(mSortAscending);
break;
}
-
+
return files;
}
-
+
/**
* Sorts list by Date
- * @param sortAscending true: ascending, false: descending
+ * @param files
*/
public static Vector<OCFile> sortByDate(Vector<OCFile> files){
final Integer val;
} else {
val = -1;
}
-
+
Collections.sort(files, new Comparator<OCFile>() {
public int compare(OCFile o1, OCFile o2) {
if (o1.isFolder() && o2.isFolder()) {
}
}
});
-
+
return files;
}
// } else {
// val = -1;
// }
-//
+//
// Collections.sort(files, new Comparator<OCFile>() {
// public int compare(OCFile o1, OCFile o2) {
// if (o1.isFolder() && o2.isFolder()) {
// }
// }
// });
-//
+//
// return files;
// }
/**
* 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;
return val * new AlphanumComparator().compare(o1, o2);
}
});
-
+
return files;
}
-
+
/**
* Local Folder size
* @param dir File
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 : "";
+ }
}
projects / pub / Android / ownCloud.git / blobdiff