Browse Source

Merge pull request #2090 from nextcloud/listFilesNull

List files can be null
Andy Scherzinger 7 years ago
parent
commit
2ebcec12c7
1 changed files with 12 additions and 8 deletions
  1. 12 8
      src/main/java/com/owncloud/android/utils/FileStorageUtils.java

+ 12 - 8
src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -217,16 +217,20 @@ public class FileStorageUtils {
      * @return Size in bytes
      */
     public static long getFolderSize(File dir) {
-        if (dir.exists()) {
-            long result = 0;
-            for (File f : dir.listFiles()) {
-                if (f.isDirectory()) {
-                    result += getFolderSize(f);
-                } else {
-                    result += f.length();
+        if (dir.exists() && dir.isDirectory()) {
+            File[] files = dir.listFiles();
+
+            if (files != null) {
+                long result = 0;
+                for (File f : files) {
+                    if (f.isDirectory()) {
+                        result += getFolderSize(f);
+                    } else {
+                        result += f.length();
+                    }
                 }
+                return result;
             }
-            return result;
         }
         return 0;
     }