Activity list:

- show correct placeholder
- click on preview open file

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -52,7 +52,6 @@ import java.util.List;
 import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -234,7 +234,10 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                     for (PreviewObject previewObject : activity.getPreviews()) {
                         if (!isDetailView || MimeTypeUtil.isImageOrVideo(previewObject.getMimeType()) ||
                             MimeTypeUtil.isVideo(previewObject.getMimeType())) {
-                            ImageView imageView = createThumbnailNew(previewObject);
+                            ImageView imageView = createThumbnailNew(previewObject,
+                                                                     activity
+                                                                         .getRichSubjectElement()
+                                                                         .getRichObjectList());
                             activityViewHolder.list.addView(imageView);
                         }
                     }
@@ -256,14 +259,26 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         }
     }
 
-    private ImageView createThumbnailNew(PreviewObject previewObject) {
+    private ImageView createThumbnailNew(PreviewObject previewObject, List<RichObject> richObjectList) {
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(px, px);
         params.setMargins(10, 10, 10, 10);
         ImageView imageView = new ImageView(context);
         imageView.setLayoutParams(params);
 
+        for (RichObject object : richObjectList) {
+            if (Integer.parseInt(object.getId()) == previewObject.getFileId()) {
+                imageView.setOnClickListener(v -> activityListInterface.onActivityClicked(object));
+                break;
+            }
+        }
+
         if (MimeTypeUtil.isImageOrVideo(previewObject.getMimeType())) {
-            int placeholder = R.drawable.file;
+            int placeholder;
+            if (MimeTypeUtil.isImage(previewObject.getMimeType())) {
+                placeholder = R.drawable.file_image;
+            } else {
+                placeholder = R.drawable.file_movie;
+            }
             Glide.with(context).using(new CustomGlideStreamLoader(currentAccountProvider, clientFactory))
                 .load(previewObject.getSource())
                 .placeholder(placeholder)
@@ -271,8 +286,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 .into(imageView);
         } else {
             if (MimeTypeUtil.isFolder(previewObject.getMimeType())) {
-                imageView.setImageDrawable(
-                    MimeTypeUtil.getDefaultFolderIcon(context));
+                imageView.setImageDrawable(MimeTypeUtil.getDefaultFolderIcon(context));
             } else {
                 imageView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(previewObject.getMimeType(), "", context));
             }