Skip to content

Commit 85acc76

Browse files
nickvergessenAndyScherzinger
authored andcommitted
Start using the previews from the server
Signed-off-by: Joas Schilling <[email protected]>
1 parent 9385f5d commit 85acc76

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

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

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
import com.owncloud.android.lib.common.OwnCloudClient;
5757
import com.owncloud.android.lib.common.utils.Log_OC;
5858
import com.owncloud.android.lib.resources.activities.models.Activity;
59+
import com.owncloud.android.lib.resources.activities.models.PreviewObject;
5960
import com.owncloud.android.lib.resources.activities.models.RichElement;
6061
import com.owncloud.android.lib.resources.activities.models.RichObject;
61-
import com.owncloud.android.lib.resources.files.FileUtils;
6262
import com.owncloud.android.ui.interfaces.ActivityListInterface;
6363
import com.owncloud.android.utils.DisplayUtils;
6464
import com.owncloud.android.utils.MimeTypeUtil;
@@ -177,8 +177,10 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
177177
downloadIcon(activity.getIcon(), activityViewHolder.activityIcon);
178178
}
179179

180-
if (activity.getRichSubjectElement() != null &&
181-
activity.getRichSubjectElement().getRichObjectList().size() > 0) {
180+
List<PreviewObject> previews = activity.getPreviews();
181+
int numPreviews = previews.size();
182+
if (numPreviews > 0) {
183+
Log_OC.e(TAG, "Previews: " + numPreviews);
182184

183185
activityViewHolder.list.setVisibility(View.VISIBLE);
184186
activityViewHolder.list.removeAllViews();
@@ -196,11 +198,10 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
196198
});
197199

198200

199-
for (RichObject richObject : activity.getRichSubjectElement().getRichObjectList()) {
200-
if (richObject.getPath() != null) {
201-
ImageView imageView = createThumbnail(richObject);
202-
activityViewHolder.list.addView(imageView);
203-
}
201+
for (int i = 0; i < numPreviews; i++) {
202+
PreviewObject preview = previews.get(i);
203+
ImageView imageView = createThumbnail(preview);
204+
activityViewHolder.list.addView(imageView);
204205
}
205206

206207
} else {
@@ -213,24 +214,19 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
213214
}
214215
}
215216

216-
private ImageView createThumbnail(final RichObject richObject) {
217-
String path = FileUtils.PATH_SEPARATOR + richObject.getPath();
218-
OCFile file = storageManager.getFileByPath(path);
219-
220-
if (file == null) {
221-
file = storageManager.getFileByPath(path + FileUtils.PATH_SEPARATOR);
222-
}
223-
if (file == null) {
224-
file = new OCFile(path);
225-
file.setRemoteId(richObject.getId());
226-
}
227-
217+
private ImageView createThumbnail(final PreviewObject preview) {
228218
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(px, px);
229219
params.setMargins(10, 10, 10, 10);
230220
ImageView imageView = new ImageView(context);
231221
imageView.setLayoutParams(params);
232-
imageView.setOnClickListener(v -> activityListInterface.onActivityClicked(richObject));
233-
setBitmap(file, imageView);
222+
223+
Glide.with(context).using(new CustomGlideStreamLoader()).load(preview.getSource()).into(imageView);
224+
imageView.setOnClickListener(new View.OnClickListener() {
225+
@Override
226+
public void onClick(View v) {
227+
// activityListInterface.onActivityClicked(preview.getLink());
228+
}
229+
});
234230

235231
return imageView;
236232
}

0 commit comments

Comments
 (0)