Fix for folder name, image name NPE (#316)

* Fix for folder name, image name NPE * Fix for folder name, image name NPE * Code style updates
esafirm · Feb 14, 2021 · 0b307a3 · 0b307a3
1 parent 924e862
commit 0b307a3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/...ker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.java b/...ker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.java
@@ -156,17 +156,17 @@ public void run() {
                     String name = cursor.getString(cursor.getColumnIndex(projection[1]));
                     String bucket = cursor.getString(cursor.getColumnIndex(projection[3]));
 
-                    Image image = new Image(id, name, path);
-
-                    temp.add(image);
-
-                    if (folderMap != null) {
-                        Folder folder = folderMap.get(bucket);
-                        if (folder == null) {
-                            folder = new Folder(bucket);
-                            folderMap.put(bucket, folder);
+                    if (name != null) {
+                        Image image = new Image(id, name, path);
+                        temp.add(image);
+                        if (folderMap != null && bucket != null) {
+                            Folder folder = folderMap.get(bucket);
+                            if (folder == null) {
+                                folder = new Folder(bucket);
+                                folderMap.put(bucket, folder);
+                            }
+                            folder.getImages().add(image);
                         }
-                        folder.getImages().add(image);
                     }
 
                 } while (cursor.moveToPrevious());