Эх сурвалжийг харах

Replace equals with == on enums

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 3 жил өмнө
parent
commit
075e91d9ba

+ 11 - 9
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -376,6 +376,11 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             OCFile file = getItem(position);
 
+            if (file == null) {
+                Log_OC.e(this, "Cannot bind on view holder on a null file");
+                return;
+            }
+
             boolean gridImage = MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file);
 
             gridViewHolder.getThumbnail().setTag(file.getFileId());
@@ -823,7 +828,12 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
         }
 
-        if (MimeTypeUtil.isImageOrVideo(getItem(position))) {
+        OCFile item = getItem(position);
+        if (item == null) {
+            return VIEWTYPE_ITEM;
+        }
+
+        if (MimeTypeUtil.isImageOrVideo(item)) {
             return VIEWTYPE_IMAGE;
         } else {
             return VIEWTYPE_ITEM;
@@ -1225,14 +1235,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     @NonNull
     @Override
     public String getSectionName(int position) {
-        // sort
-//        FileSortOrder.SortType sortOrderType;
-//        if (ocFileListFragmentInterface.isGalleryFragment()) {
-//            sortOrderType = FileSortOrder.SortType.DATE;
-//        } else {
-//            sortOrderType = preferences.getSortOrderByFolder(currentDirectory).getType();
-//        }
-
         OCFile file = getItem(position);
 
         if (file == null) {

+ 4 - 0
app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java

@@ -213,6 +213,10 @@ public class GalleryFragment extends OCFileListFragment {
                     // Almost reached the end, continue to load new photos
                     OCFile lastFile = mAdapter.getItem(lastVisibleItem - 1);
 
+                    if (lastFile == null) {
+                        return;
+                    }
+
                     daySpan = 30;
                     endDate = lastFile.getModificationTimestamp() / 1000;
                     startDate = endDate - (daySpan * 24 * 60 * 60);