Commit 6eb8c8c9 authored by Tiago Cunha's avatar Tiago Cunha Committed by GitHub

Merge branch 'develop' into configure_circle_ci_artifact

parents 1c4589ba b3516ddd
...@@ -5,6 +5,7 @@ import android.content.Context; ...@@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -132,8 +133,8 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout { ...@@ -132,8 +133,8 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout {
.downloader(getDownloader()) .downloader(getDownloader())
.build() .build()
.load(absolutize(imageURL)) .load(absolutize(imageURL))
.placeholder(R.drawable.image_dummy) .placeholder(VectorDrawableCompat.create(getResources(), R.drawable.image_dummy, null))
.error(R.drawable.image_error) .error(VectorDrawableCompat.create(getResources(), R.drawable.image_error, null))
.into((ImageView) attachmentView.findViewById(R.id.image)); .into((ImageView) attachmentView.findViewById(R.id.image));
TextView titleView = (TextView) attachmentView.findViewById(R.id.title); TextView titleView = (TextView) attachmentView.findViewById(R.id.title);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment