No more NULL pointers from getDirectoryContent (2)

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 7b66149..3f67dc2 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -257,7 +257,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         // click on folder in the list\r
         Log.d(TAG, "on item click");\r
         Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);\r
         // click on folder in the list\r
         Log.d(TAG, "on item click");\r
         Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);\r

-        if (tmpfiles == null) return;\r
+        if (tmpfiles.size() <= 0) return;\r

         // filter on dirtype\r
         Vector<OCFile> files = new Vector<OCFile>();\r
         for (OCFile f : tmpfiles)\r
         // filter on dirtype\r
         Vector<OCFile> files = new Vector<OCFile>();\r
         for (OCFile f : tmpfiles)\r


@@ -325,7 +325,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         mFile = mStorageManager.getFileByPath(full_path);\r
         if (mFile != null) {\r
             Vector<OCFile> files = mStorageManager.getDirectoryContent(mFile);\r
         mFile = mStorageManager.getFileByPath(full_path);\r
         if (mFile != null) {\r
             Vector<OCFile> files = mStorageManager.getDirectoryContent(mFile);\r

-            if (files != null) {\r
+            if (files.size() > 0) {\r

                 List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();\r
                 for (OCFile f : files) {\r
                     HashMap<String, Object> h = new HashMap<String, Object>();\r
                 List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();\r
                 for (OCFile f : files) {\r
                     HashMap<String, Object> h = new HashMap<String, Object>();\r

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index e011953..3adebee 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -456,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);