mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Add photos inline" 

This reverts commit ab5d7d6c22.
This commit is contained in:
M66B 2019-09-09 10:07:23 +02:00
parent 272f8fa791
commit 04dd7fc0cd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -1163,9 +1163,9 @@ public class FragmentCompose extends FragmentBase {
case REQUEST_TAKE_PHOTO: case REQUEST_TAKE_PHOTO:
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
if (requestCode == REQUEST_TAKE_PHOTO) if (requestCode == REQUEST_TAKE_PHOTO)
onAddMedia(new Intent().setData(photoURI), true); onAddMedia(new Intent().setData(photoURI));
else if (data != null) else if (data != null)
onAddMedia(data, false); onAddMedia(data);
break; break;
case REQUEST_ENCRYPT: case REQUEST_ENCRYPT:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
@ -1346,21 +1346,18 @@ public class FragmentCompose extends FragmentBase {
}.execute(this, args, "compose:attachment:add"); }.execute(this, args, "compose:attachment:add");
} }
private void onAddMedia(Intent data, boolean image) { private void onAddMedia(Intent data) {
Log.i("Add media data=" + data);
Log.logExtras(data);
ClipData clipData = data.getClipData(); ClipData clipData = data.getClipData();
if (clipData == null) { if (clipData == null) {
Uri uri = data.getData(); Uri uri = data.getData();
if (uri != null) if (uri != null)
onAddAttachment(uri, image); onAddAttachment(uri, false);
} else { } else {
for (int i = 0; i < clipData.getItemCount(); i++) { for (int i = 0; i < clipData.getItemCount(); i++) {
ClipData.Item item = clipData.getItemAt(i); ClipData.Item item = clipData.getItemAt(i);
Uri uri = item.getUri(); Uri uri = item.getUri();
if (uri != null) if (uri != null)
onAddAttachment(uri, image); onAddAttachment(uri, false);
} }
} }
} }