Merge pull request #530 from nextcloud/fixAutoUploadViewNPE

Fix NPE and improve performance of Auto Upload view
nextcloud · Jan 11, 2017 · ebc78f3 · ebc78f3
2 parents b38ed61 + b25f9ec
commit ebc78f3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10040102"
-    android:versionName="1.4.1 RC2">
+    android:versionCode="10040103"
+    android:versionName="1.4.1 RC3">
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/src/com/owncloud/android/datamodel/MediaProvider.java b/src/com/owncloud/android/datamodel/MediaProvider.java
@@ -91,22 +91,25 @@ public static List<MediaFolder> getMediaFolders(ContentResolver contentResolver,
                     }
                     cursorImages.close();
 
-                    // count images
-                    Cursor count = contentResolver.query(
-                            MEDIA_URI,
-                            FILE_PROJECTION,
-                            FILE_SELECTION + folderId,
-                            null,
-                            null);
-
-                    if (count != null) {
-                        mediaFolder.numberOfFiles = count.getCount();
-                        count.close();
+                    // only do further work if folder is not within the Nextcloud app itself
+                    if (!mediaFolder.absolutePath.startsWith(dataPath)) {
+
+                        // count images
+                        Cursor count = contentResolver.query(
+                                MEDIA_URI,
+                                FILE_PROJECTION,
+                                FILE_SELECTION + folderId,
+                                null,
+                                null);
+
+                        if (count != null) {
+                            mediaFolder.numberOfFiles = count.getCount();
+                            count.close();
+                        }
+
+                        mediaFolders.add(mediaFolder);
                     }
                 }
-                if (!mediaFolder.absolutePath.startsWith(dataPath)) {
-                    mediaFolders.add(mediaFolder);
-                }
             }
             cursorFolders.close();
         }