TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

clear pending slides when attachment reselected

Browse Source 
Fixes #2012

// FREEBIE
This commit is contained in:
Jake McGinty 2014-10-28 10:36:27 -05:00
parent db6f8618e6
commit 4cab657ebe
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@ -61,27 +61,27 @@ public class AttachmentManager {
} }
public void setImage(Uri image) throws IOException, BitmapDecodingException { public void setImage(Uri image) throws IOException, BitmapDecodingException {
ImageSlide slide = new ImageSlide(context, image); setMedia(new ImageSlide(context, image), 345, 261);
slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(345, 261));
attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged();
} }
public void setVideo(Uri video) throws IOException, MediaTooLargeException { public void setVideo(Uri video) throws IOException, MediaTooLargeException {
VideoSlide slide = new VideoSlide(context, video); setMedia(new VideoSlide(context, video));
}
public void setAudio(Uri audio) throws IOException, MediaTooLargeException {
setMedia(new AudioSlide(context, audio));
}
public void setMedia(Slide slide, int thumbnailWidth, int thumbnailHeight) {
slideDeck.clear();
slideDeck.addSlide(slide); slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(thumbnail.getWidth(), thumbnail.getHeight())); thumbnail.setImageDrawable(slide.getThumbnail(thumbnailWidth, thumbnailHeight));
attachmentView.setVisibility(View.VISIBLE); attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged(); attachmentListener.onAttachmentChanged();
} }
public void setAudio(Uri audio)throws IOException, MediaTooLargeException { public void setMedia(Slide slide) {
AudioSlide slide = new AudioSlide(context, audio); setMedia(slide, thumbnail.getWidth(), thumbnail.getHeight());
slideDeck.addSlide(slide);
thumbnail.setImageDrawable(slide.getThumbnail(thumbnail.getWidth(), thumbnail.getHeight()));
attachmentView.setVisibility(View.VISIBLE);
attachmentListener.onAttachmentChanged();
} }
public boolean isAttachmentPresent() { public boolean isAttachmentPresent() {