use image url instead of generating previews by oneself

tobiasKaminsky · tobiasKaminsky · commit c620a931b3ab · 2018-10-12T10:30:28.000+02:00
Signed-off-by: tobiasKaminsky &lt;tobias@kaminsky.me&gt;
diff --git a/build.gradle b/build.gradle
@@ -16,9 +16,9 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'org.codehaus.groovy:groovy-all:2.4.12' 
-        classpath('com.dicedmelon.gradle:jacoco-android:0.1.3') { 
-            exclude group: 'org.codehaus.groovy', module: 'groovy-all' 
+        classpath 'org.codehaus.groovy:groovy-all:2.4.12'
+        classpath('com.dicedmelon.gradle:jacoco-android:0.1.3') {
+            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         }
     }
 }
@@ -212,9 +212,9 @@ dependencies {
     // dependencies for app building
     implementation 'com.android.support:multidex:1.0.3'
 //    implementation project('nextcloud-android-library')
-    genericImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
-    gplayImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
-    versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
+    genericImplementation "com.github.nextcloud:android-library:activity-previews-SNAPSHOT"
+    gplayImplementation "com.github.nextcloud:android-library:activity-previews-SNAPSHOT"
+    versionDevImplementation 'com.github.nextcloud:android-library:activity-previews-SNAPSHOT' // use always latest master
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation "com.android.support:support-v4:${supportLibraryVersion}"
     implementation "com.android.support:design:${supportLibraryVersion}"
@@ -268,7 +268,7 @@ dependencies {
 
     findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.8.0'
     findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.3'
-    
+
 //    jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
 //    jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
 //    androidJacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
diff --git a/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java b/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java
@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   Copyright (C) 2018 Edvard Holst
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
@@ -35,7 +36,6 @@
 import android.widget.Toast;
 
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -169,8 +169,7 @@ private void setupContent() {
         emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(this),
                 PorterDuff.Mode.SRC_IN);
 
-        FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
-        adapter = new ActivityListAdapter(this, this, storageManager, false);
+        adapter = new ActivityListAdapter(this, this, false);
         recyclerView.setAdapter(adapter);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -179,7 +178,7 @@ private void setupContent() {
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
 
             @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
 
                 int visibleItemCount = recyclerView.getChildCount();
@@ -230,7 +229,7 @@ protected void onResume() {
         super.onResume();
 
         setDrawerMenuItemChecked(R.id.nav_activity);
-        
+
         setupContent();
     }
 
diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java
@@ -34,7 +34,7 @@ public class ActivityAndVersionListAdapter extends ActivityListAdapter {
     public ActivityAndVersionListAdapter(Context context, ActivityListInterface activityListInterface,
                                          VersionListInterface.View versionListInterface,
                                          FileDataStorageManager storageManager) {
-        super(context, activityListInterface, storageManager, true);
+        super(context, activityListInterface, true);
 
         this.versionListInterface = versionListInterface;
     }
diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
@@ -52,14 +52,12 @@
 import com.caverock.androidsvg.SVG;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.activities.models.Activity;
+import com.owncloud.android.lib.resources.activities.models.PreviewObject;
 import com.owncloud.android.lib.resources.activities.models.RichElement;
 import com.owncloud.android.lib.resources.activities.models.RichObject;
-import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.interfaces.ActivityListInterface;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
@@ -77,36 +75,33 @@
  */
 public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    protected static final int HEADER_TYPE = 100;
-    protected static final int ACTIVITY_TYPE = 101;
-    protected final ActivityListInterface activityListInterface;
+    static final int HEADER_TYPE = 100;
+    static final int ACTIVITY_TYPE = 101;
+    private final ActivityListInterface activityListInterface;
     private final int px;
     private static final String TAG = ActivityListAdapter.class.getSimpleName();
     protected OwnCloudClient client;
 
     protected Context context;
-    private FileDataStorageManager storageManager;
     protected List<Object> values;
     private boolean isDetailView;
 
-    public ActivityListAdapter(Context context, ActivityListInterface activityListInterface,
-                               FileDataStorageManager storageManager, boolean isDetailView) {
+    public ActivityListAdapter(Context context, ActivityListInterface activityListInterface, boolean isDetailView) {
         this.values = new ArrayList<>();
         this.context = context;
         this.activityListInterface = activityListInterface;
-        this.storageManager = storageManager;
         px = getThumbnailDimension();
         this.isDetailView = isDetailView;
     }
 
     public void setActivityItems(List<Object> activityItems, OwnCloudClient client, boolean clear) {
         this.client = client;
         String sTime = "";
-        
+
         if (clear) {
             values.clear();
         }
-        
+
         for (Object o : activityItems) {
             Activity activity = (Activity) o;
             String time;
@@ -196,14 +191,13 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                     }
                 });
 
-
-                for (RichObject richObject : activity.getRichSubjectElement().getRichObjectList()) {
-                    if (richObject.getPath() != null) {
-                        ImageView imageView = createThumbnail(richObject, isDetailView);
+                for (PreviewObject previewObject : activity.getPreviews()) {
+                    if (!isDetailView || isDetailView && (MimeTypeUtil.isImageOrVideo(previewObject.getMimeType()) ||
+                        MimeTypeUtil.isVideo(previewObject.getMimeType()))) {
+                        ImageView imageView = createThumbnail(previewObject);
                         activityViewHolder.list.addView(imageView);
                     }
                 }
-
             } else {
                 activityViewHolder.list.removeAllViews();
                 activityViewHolder.list.setVisibility(View.GONE);
@@ -214,64 +208,26 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         }
     }
 
-    private ImageView createThumbnail(final RichObject richObject, boolean isDetailView) {
-        String path = FileUtils.PATH_SEPARATOR + richObject.getPath();
-        OCFile file = storageManager.getFileByPath(path);
-
-        if (file == null) {
-            file = storageManager.getFileByPath(path + FileUtils.PATH_SEPARATOR);
-        }
-        if (file == null) {
-            file = new OCFile(path);
-            file.setRemoteId(richObject.getId());
-        }
-
+    private ImageView createThumbnail(PreviewObject previewObject) {
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(px, px);
         params.setMargins(10, 10, 10, 10);
         ImageView imageView = new ImageView(context);
         imageView.setLayoutParams(params);
-        imageView.setOnClickListener(v -> activityListInterface.onActivityClicked(richObject));
-        setBitmap(file, imageView, isDetailView);
-
-        return imageView;
-    }
 
-    private void setBitmap(OCFile file, ImageView fileIcon, boolean isDetailView) {
-        // No Folder
-        if (!file.isFolder()) {
-            if (MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) {
-                int placeholder;
-
-                if (MimeTypeUtil.isImage(file)) {
-                    placeholder = R.drawable.file_image;
-                } else {
-                    placeholder = R.drawable.file_movie;
-                }
-
-                String uri = client.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + px + "/" + px +
-                        Uri.encode(file.getRemotePath(), "/");
-
-                Glide.with(context).using(new CustomGlideStreamLoader()).load(uri).placeholder(placeholder)
-                        .error(placeholder).into(fileIcon); // using custom fetcher
-
-            } else {
-                if (isDetailView) {
-                    fileIcon.setVisibility(View.GONE);
-                } else {
-                    fileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(), file.getFileName(),
-                            context));
-                }
-            }
+        if (MimeTypeUtil.isImageOrVideo(previewObject.getMimeType())) {
+            int placeholder = R.drawable.file;
+            Glide.with(context).using(new CustomGlideStreamLoader()).load(previewObject.getSource()).
+                placeholder(placeholder).error(placeholder).into(imageView);
         } else {
-            // Folder
-            if (isDetailView) {
-                fileIcon.setVisibility(View.GONE);
+            if (MimeTypeUtil.isFolder(previewObject.getMimeType())) {
+                imageView.setImageDrawable(
+                    MimeTypeUtil.getDefaultFolderIcon(context));
             } else {
-                fileIcon.setImageDrawable(
-                        MimeTypeUtil.getFolderTypeIcon(file.isSharedWithMe() || file.isSharedWithSharee(),
-                                file.isSharedViaLink(), file.isEncrypted(), file.getMountType(), context));
+                imageView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(previewObject.getMimeType(), "", context));
             }
         }
+
+        return imageView;
     }
 
     private void downloadIcon(String icon, ImageView itemViewType) {
@@ -312,12 +268,12 @@ private SpannableStringBuilder addClickablePart(RichElement richElement) {
                 idx2 = idx1 + name.length();
                 ssb.setSpan(new ClickableSpan() {
                     @Override
-                    public void onClick(View widget) {
+                    public void onClick(@NonNull View widget) {
                         activityListInterface.onActivityClicked(richObject);
                     }
 
                     @Override
-                    public void updateDrawState(TextPaint ds) {
+                    public void updateDrawState(@NonNull TextPaint ds) {
                         ds.setUnderlineText(false);
                     }
                 }, idx1, idx2, 0);
@@ -366,7 +322,7 @@ private int getThumbnailDimension() {
         return d.intValue();
     }
 
-    protected CharSequence getHeaderDateString(Context context, long modificationTimestamp) {
+    CharSequence getHeaderDateString(Context context, long modificationTimestamp) {
         if ((System.currentTimeMillis() - modificationTimestamp) < DateUtils.WEEK_IN_MILLIS) {
             return DisplayUtils.getRelativeDateTimeString(context, modificationTimestamp, DateUtils.DAY_IN_MILLIS,
                     DateUtils.WEEK_IN_MILLIS, 0);
@@ -383,7 +339,7 @@ protected class ActivityViewHolder extends RecyclerView.ViewHolder {
         private final TextView dateTime;
         private final GridLayout list;
 
-        protected ActivityViewHolder(View itemView) {
+        ActivityViewHolder(View itemView) {
             super(itemView);
             activityIcon = itemView.findViewById(R.id.activity_icon);
             subject = itemView.findViewById(R.id.activity_subject);
@@ -397,7 +353,7 @@ protected class ActivityViewHeaderHolder extends RecyclerView.ViewHolder {
 
         private final TextView title;
 
-        protected ActivityViewHeaderHolder(View itemView) {
+        ActivityViewHeaderHolder(View itemView) {
             super(itemView);
             title = itemView.findViewById(R.id.title_header);
 
diff --git a/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java b/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
@@ -157,7 +157,7 @@ public static Drawable getFolderTypeIcon(boolean isSharedViaUsers, boolean isSha
      * @return Identifier of an image resource.
      */
     public static Drawable getFolderTypeIcon(boolean isSharedViaUsers, boolean isSharedViaLink,
-                                             boolean isEncrypted, Account account, WebdavEntry.MountType mountType, 
+                                             boolean isEncrypted, Account account, WebdavEntry.MountType mountType,
                                              Context context) {
         int drawableId;
 
@@ -167,7 +167,7 @@ public static Drawable getFolderTypeIcon(boolean isSharedViaUsers, boolean isSha
             drawableId = R.drawable.shared_with_me_folder;
         } else if (isEncrypted) {
             drawableId = R.drawable.ic_list_encrypted_folder;
-        } else if (WebdavEntry.MountType.EXTERNAL.equals(mountType)) {
+        } else if (WebdavEntry.MountType.EXTERNAL == mountType) {
             drawableId = R.drawable.folder_external;
         } else {
             drawableId = R.drawable.folder;
@@ -196,6 +196,10 @@ public static String getBestMimeTypeByFilename(String filename) {
         return candidates.get(0);
     }
 
+    public static boolean isImageOrVideo(String mimeType) {
+        return isImage(mimeType) || isVideo(mimeType);
+    }
+
     /**
      * @return 'True' if the mime type defines image
      */
@@ -221,7 +225,7 @@ public static boolean isAudio(String mimeType) {
     /**
      * @return 'True' if mime type defines text
      */
-    public static boolean isText(String mimeType) {
+    private static boolean isText(String mimeType) {
         return mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("text/");
     }
 
@@ -298,6 +302,10 @@ public static boolean isVCard(OCFile file) {
         return isVCard(file.getMimeType()) || isVCard(getMimeTypeFromPath(file.getRemotePath()));
     }
 
+    public static boolean isFolder(String mimeType) {
+        return MimeType.DIRECTORY.equalsIgnoreCase(mimeType);
+    }
+
     /**
      * Extracts the mime type for the given file.
      *

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class ActivityAndVersionListAdapter extends ActivityListAdapter {`
`34`	`34`	`public ActivityAndVersionListAdapter(Context context, ActivityListInterface activityListInterface,`
`35`	`35`	`VersionListInterface.View versionListInterface,`
`36`	`36`	`FileDataStorageManager storageManager) {`
`37`		`- super(context, activityListInterface, storageManager, true);`
	`37`	`+ super(context, activityListInterface, true);`
`38`	`38`
`39`	`39`	`this.versionListInterface = versionListInterface;`
`40`	`40`	`}`