Fixed lack of File#getUsableSpace() in Android versions previous to GINGERBREAD

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / FileDataStorageManager.java

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 2640404..3adebee 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -292,8 +292,8 @@ public class FileDataStorageManager implements DataStorageManager {
 
     @Override
     public Vector<OCFile> getDirectoryContent(OCFile f) {
 
     @Override
     public Vector<OCFile> getDirectoryContent(OCFile f) {

+        Vector<OCFile> ret = new Vector<OCFile>();

         if (f != null && f.isDirectory() && f.getFileId() != -1) {
         if (f != null && f.isDirectory() && f.getFileId() != -1) {

-            Vector<OCFile> ret = new Vector<OCFile>();

 
             Uri req_uri = Uri.withAppendedPath(
                     ProviderTableMeta.CONTENT_URI_DIR,
 
             Uri req_uri = Uri.withAppendedPath(
                     ProviderTableMeta.CONTENT_URI_DIR,


@@ -326,9 +326,8 @@ public class FileDataStorageManager implements DataStorageManager {
             
             Collections.sort(ret);
             
             
             Collections.sort(ret);
             

-            return ret;

         }
         }

-        return null;
+        return ret;

     }
 
     private boolean fileExists(String cmp_key, String value) {
     }
 
     private boolean fileExists(String cmp_key, String value) {


@@ -457,7 +456,7 @@ public class FileDataStorageManager implements DataStorageManager {
         // TODO consider possible failures
         if (dir != null && dir.isDirectory() && dir.getFileId() != -1) {
             Vector<OCFile> children = getDirectoryContent(dir);
         // TODO consider possible failures
         if (dir != null && dir.isDirectory() && dir.getFileId() != -1) {
             Vector<OCFile> children = getDirectoryContent(dir);

-            if (children != null) {
+            if (children.size() > 0) {

                 OCFile child = null;
                 for (int i=0; i<children.size(); i++) {
                     child = children.get(i);
                 OCFile child = null;
                 for (int i=0; i<children.size(); i++) {
                     child = children.get(i);