TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-24 20:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow share intents for arbitrary file types

Browse Source 
Fixes #6608
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-05-10 15:21:52 -07:00
parent 1c8c6d5f85
commit e96bf2bdc7
8 changed files with 183 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@@ -876,7 +876,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
final String draftText = getIntent().getStringExtra(TEXT_EXTRA);
final Uri draftMedia = getIntent().getData();
final MediaType draftMediaType = MediaType.from(getIntent().getType());
if (draftText != null) composeText.setText(draftText);
if (draftMedia != null && draftMediaType != null) setMedia(draftMedia, draftMediaType);
@@ -1605,7 +1605,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
public void onImageCapture(@NonNull final byte[] imageBytes) {
setMedia(PersistentBlobProvider.getInstance(this)
.create(masterSecret, imageBytes, MediaUtil.IMAGE_JPEG),
.create(masterSecret, imageBytes, MediaUtil.IMAGE_JPEG, null),
MediaType.IMAGE);
quickAttachmentDrawer.hide(false);
}