Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Fix sticker display bug #2175

Merged
merged 3 commits into from
Apr 24, 2018
Merged

Fix sticker display bug #2175

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc43c6
Fix sticker display bug
Tyuoli Apr 23, 2018
7935d37
Check if a message is an instance of StickerMessage instead of a Even…
Tyuoli Apr 24, 2018
0b5d580
Test if message is a StickerMessage first
Tyuoli Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions vector/src/main/java/im/vector/adapters/VectorMessagesAdapterMediasHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.google.gson.JsonElement;

import org.matrix.androidsdk.MXSession;
Expand Down Expand Up @@ -272,19 +273,23 @@ void managePendingImageVideoDownload(final View convertView, final Event event,
if (null == downloadId) {
if (message instanceof VideoMessage) {
downloadId = mMediasCache.downloadIdFromUrl(((VideoMessage) message).getUrl());
} else if (message instanceof ImageMessage) {
if (event.getType().equals(Event.EVENT_TYPE_STICKER)) {
downloadId = mMediasCache.downloadIdStickerFromUrl(((StickerMessage) message).getUrl());
} else {
downloadId = mMediasCache.downloadIdFromUrl(((ImageMessage) message).getUrl());
}
} else if (!event.getType().equals(Event.EVENT_TYPE_STICKER) && (message instanceof ImageMessage)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove test on Event type

downloadId = mMediasCache.downloadIdFromUrl(((ImageMessage) message).getUrl());
} else if (event.getType().equals(Event.EVENT_TYPE_STICKER) && (message instanceof StickerMessage)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove test on event type and test if message is a StickerMessage before ImageMessage

downloadId = mMediasCache.downloadIdStickerFromUrl(((StickerMessage) message).getUrl());
}
}

// Use Glide library to display stickers into ImageView
// Glide support animated gif
if (event.getType().equals(Event.EVENT_TYPE_STICKER)) {
Glide.with(mContext).load(downloadId).into(imageView);
Glide.with(mContext)
.load(downloadId)
.apply(new RequestOptions()
.override(maxImageWidth, maxImageHeight)
.fitCenter()
)
.into(imageView);
}

final View downloadProgressLayout = convertView.findViewById(R.id.content_download_progress_layout);
Expand Down