Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 23:26:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Save body with inserted image

Browse Source
This commit is contained in:
M66B
2022-02-26 10:50:30 +01:00
parent d8e88e8b7a
commit f00f789d10
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2788,13 +2788,36 @@ public class FragmentCompose extends FragmentBase {
if (!image)
return null;
args.putInt("start", start);
DB db = DB.getInstance(context);
db.message().setMessagePlainOnly(id, 0);
args.putInt("start", start);
String html = HtmlHelper.toHtml(s, context);
// TODO: double conversion
return HtmlHelper.fromHtml(HtmlHelper.toHtml(s, context), new Html.ImageGetter() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean write_below = prefs.getBoolean("write_below", false);
EntityMessage draft = db.message().getMessage(id);
if (draft != null) {
File file = draft.getFile(context);
Elements ref = JsoupEx.parse(file).select("div[fairemail=reference]");
Document doc = JsoupEx.parse(html);
for (Element e : ref)
if (write_below && draft.wasforwardedfrom == null)
doc.body().prependChild(e);
else
doc.body().appendChild(e);
EntityIdentity identity = db.identity().getIdentity(draft.identity);
addSignature(context, doc, draft, identity);
Helper.writeText(file, doc.html());
}
return HtmlHelper.fromHtml(html, new Html.ImageGetter() {
@Override
public Drawable getDrawable(String source) {
return ImageHelper.decodeImage(context, id, source, true, zoom, 1.0f, etBody);
@@ -2804,16 +2827,14 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onExecuted(Bundle args, final Spanned body) {
if (body != null) {
int start = args.getInt("start");
if (body == null)
return;
etBody.setText(body);
if (start < body.length())
etBody.setSelection(start);
etBody.setText(body);
// Save text with image
onAction(R.id.action_save, "image");
}
int start = args.getInt("start");
if (start < body.length())
etBody.setSelection(start);
}
@Override