Merge pull request #2218 from McLoo/fix_av_draft_2

Enabled audio and video drafts
This commit is contained in:
Moxie Marlinspike 2014-12-14 11:19:21 -08:00
commit 199c28dad6

View File

@ -894,9 +894,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
for (Slide slide : attachmentManager.getSlideDeck().getSlides()) { for (Slide slide : attachmentManager.getSlideDeck().getSlides()) {
if (slide.hasImage()) drafts.add(new Draft(Draft.IMAGE, slide.getUri().toString())); if (slide.hasAudio()) drafts.add(new Draft(Draft.AUDIO, slide.getUri().toString()));
else if (slide.hasAudio()) drafts.add(new Draft(Draft.AUDIO, slide.getUri().toString()));
else if (slide.hasVideo()) drafts.add(new Draft(Draft.VIDEO, slide.getUri().toString())); else if (slide.hasVideo()) drafts.add(new Draft(Draft.VIDEO, slide.getUri().toString()));
else if (slide.hasImage()) drafts.add(new Draft(Draft.IMAGE, slide.getUri().toString()));
} }
return drafts; return drafts;