mirror of https://github.com/M66B/FairEmail.git
Add photos inline
This commit is contained in:
parent
d24e805f9f
commit
ab5d7d6c22
|
@ -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));
|
onAddMedia(new Intent().setData(photoURI), true);
|
||||||
else if (data != null)
|
else if (data != null)
|
||||||
onAddMedia(data);
|
onAddMedia(data, false);
|
||||||
break;
|
break;
|
||||||
case REQUEST_ENCRYPT:
|
case REQUEST_ENCRYPT:
|
||||||
if (resultCode == RESULT_OK && data != null) {
|
if (resultCode == RESULT_OK && data != null) {
|
||||||
|
@ -1346,18 +1346,21 @@ public class FragmentCompose extends FragmentBase {
|
||||||
}.execute(this, args, "compose:attachment:add");
|
}.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();
|
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, false);
|
onAddAttachment(uri, image);
|
||||||
} 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, false);
|
onAddAttachment(uri, image);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue