Browse Source

fix possible NPE

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 years ago
parent
commit
13593fb7f7
1 changed files with 10 additions and 5 deletions
  1. 10 5
      src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

+ 10 - 5
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -653,11 +653,16 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                                                                                    asyncTasks,
                                                                                    gridView);
                             if (thumbnail == null) {
-                                thumbnail = BitmapUtils.drawableToBitmap(
-                                    MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
-                                                                 file.getFileName(),
-                                                                 user,
-                                                                 context));
+                                Drawable drawable = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
+                                                                                 file.getFileName(),
+                                                                                 user,
+                                                                                 context);
+                                if (drawable == null) {
+                                    drawable = ResourcesCompat.getDrawable(context.getResources(),
+                                                                           R.drawable.file_image,
+                                                                           null);
+                                }
+                                thumbnail = BitmapUtils.drawableToBitmap(drawable);
                             }
                             final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
                                 new ThumbnailsCacheManager.AsyncThumbnailDrawable(context.getResources(),