This repository has been archived by the owner on Apr 12, 2022. It is now read-only.
Display stickers on the rooms #2119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
see my comments in matrix-org/matrix-android-sdk#247 the code could be simplied a lot with the right inheritage. |
manuroe
reviewed
Mar 29, 2018
| @@ -1263,20 +1275,33 @@ private View getImageVideoView(int type, final int position, View convertView, V | |||
| MessageRow row = getItem(position); | |||
| Event event = row.getEvent(); | |||
|
|
|||
| Message message; | |||
| Message message = new Message(); | |||
| R.layout.adapter_item_vector_message_merge, | ||
| R.layout.adapter_item_vector_message_image_video, |
There was a problem hiding this comment.
What did you have move adapter_item_vector_message_image_video?
It now appears twice.
| @@ -243,6 +245,37 @@ void managePendingImageVideoDownload(final View convertView, final Event event, | |||
| thumbHeight = videoMessage.info.thumbnail_info.h; | |||
| } | |||
| } | |||
| } else if (message instanceof StickerMessage) { | |||
There was a problem hiding this comment.
This code should be useless now, no?
Plus I am wondering if the condition at https://github.com/vector-im/riot-android/pull/2119/files#diff-195abc8f7f6b2882511ac16bee261c64R200 is true before going to here.
| downloadId = mMediasCache.downloadIdFromUrl(((ImageMessage) message).getUrl()); | ||
| } else if (message instanceof StickerMessage) { |
| uploadingUrl = ((ImageMessage) message).getUrl(); | ||
| isUploadingContent = ((ImageMessage) message).isLocalContent(); | ||
| } else if (message instanceof StickerMessage) { |
| } else { | ||
|
|
||
| // video | ||
| } else { |
manuroe
approved these changes
Mar 29, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
element-hq/riot-meta#146
#2097