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

display thumbnail for encrypted files without a remote thumbnail #2734

Merged
merged 1 commit into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Other changes:
Bugfix:
- Use same "Call Anyway" string from iOS (#2695)
- Improve `/markdown` command (#2673)
- Display thumbnail for encrypted files without a remote thumbnail (#2734)

Translations:
-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public View getView(int position, View convertView, ViewGroup parent) {

if (null == thumbUrl) {
thumbUrl = imageMessage.getUrl();
encryptedFileInfo = imageMessage.file;
} else if (imageMessage.info != null) {
encryptedFileInfo = imageMessage.info.thumbnail_file;
}

if (null != imageMessage.info) {
Expand All @@ -99,10 +102,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
} else {
avatarId = R.drawable.filetype_image;
}

if (null != imageMessage.info) {
encryptedFileInfo = imageMessage.info.thumbnail_file;
}
} else if (Message.MSGTYPE_VIDEO.equals(message.msgtype)) {
VideoMessage videoMessage = JsonUtils.toVideoMessage(event.getContent());

Expand Down