From ab5d7d6c22c5a0ae492d7be140d099cc3db4ab1f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 9 Sep 2019 10:00:41 +0200 Subject: [PATCH] Add photos inline --- .../java/eu/faircode/email/FragmentCompose.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 0b07f7c4a7..eea82e36fd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1163,9 +1163,9 @@ public class FragmentCompose extends FragmentBase { case REQUEST_TAKE_PHOTO: if (resultCode == RESULT_OK) if (requestCode == REQUEST_TAKE_PHOTO) - onAddMedia(new Intent().setData(photoURI)); + onAddMedia(new Intent().setData(photoURI), true); else if (data != null) - onAddMedia(data); + onAddMedia(data, false); break; case REQUEST_ENCRYPT: if (resultCode == RESULT_OK && data != null) { @@ -1346,18 +1346,21 @@ public class FragmentCompose extends FragmentBase { }.execute(this, args, "compose:attachment:add"); } - private void onAddMedia(Intent data) { + private void onAddMedia(Intent data, boolean image) { + Log.i("Add media data=" + data); + Log.logExtras(data); + ClipData clipData = data.getClipData(); if (clipData == null) { Uri uri = data.getData(); if (uri != null) - onAddAttachment(uri, false); + onAddAttachment(uri, image); } else { for (int i = 0; i < clipData.getItemCount(); i++) { ClipData.Item item = clipData.getItemAt(i); Uri uri = item.getUri(); if (uri != null) - onAddAttachment(uri, false); + onAddAttachment(uri, image); } } }