Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-05 04:19:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed adding attachments

Browse Source
This commit is contained in:
M66B
2019-10-09 18:30:50 +02:00
parent 9776fe9661
commit eedcff1913
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1395,15 +1395,20 @@ public class FragmentCompose extends FragmentBase {
long id = args.getLong("id");
Uri uri = args.getParcelable("uri");
boolean image = args.getBoolean("image");
CharSequence body = args.getCharSequence("body");
int start = args.getInt("start");
EntityAttachment attachment = addAttachment(context, id, uri, image);
if (!image)
return null;
File file = attachment.getFile(context);
Drawable d = Drawable.createFromPath(file.getAbsolutePath());
if (d == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_image));
d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
CharSequence body = args.getCharSequence("body");
int start = args.getInt("start");
Uri cid = Uri.parse("cid:" + BuildConfig.APPLICATION_ID + "." + attachment.id);
SpannableStringBuilder s = new SpannableStringBuilder(body);
@@ -1421,6 +1426,9 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onExecuted(Bundle args, final Spanned body) {
if (body == null)
return;
etBody.setText(body);
etBody.setSelection(args.getInt("start"));
@@ -1433,6 +1441,8 @@ public class FragmentCompose extends FragmentBase {
// External app sending absolute file
if (ex instanceof SecurityException)
handleFileShare();
else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.toString(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
}