Merge pull request #10253 from nextcloud/thumbnailFolderBug

Harden thumbnail generation

app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt

@@ -178,10 +178,11 @@ class GalleryAdapter(
         return files.isEmpty()
     }
 
-    fun getItem(position: Int): OCFile {
+    fun getItem(position: Int): OCFile? {
         val itemCoord = getRelativePosition(position)
-
-        return files[itemCoord.section()].files[itemCoord.relativePos()]
+        return files
+            .getOrNull(itemCoord.section())?.files
+            ?.getOrNull(itemCoord.relativePos())
     }
 
     override fun isMultiSelect(): Boolean {

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java

@@ -182,7 +182,6 @@ public class GalleryFragment extends OCFileListFragment {
 
     public void searchCompleted(boolean emptySearch, long lastTimeStamp) {
         photoSearchQueryRunning = false;
-        mAdapter.notifyDataSetChanged();
 
         if (mAdapter.isEmpty()) {
             setEmptyListMessage(SearchType.GALLERY_SEARCH);

app/src/main/res/layout/grid_image.xml

@@ -43,7 +43,7 @@
         android:contentDescription="@null"
         android:padding="@dimen/grid_image_icon_padding"
         android:scaleType="centerCrop"
-        android:src="@drawable/folder" />
+        android:src="@drawable/file_image" />
 
     <ImageView
         android:id="@+id/favorite_action"

scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 87 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 86 warnings</span>