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

Insert answer formatting

This commit is contained in:
M66B 2022-11-13 19:43:49 +01:00
parent 4cf2fe1e4d
commit 3675a2e4ae
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2412,16 +2412,41 @@ public class FragmentCompose extends FragmentBase {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);
args.putString("to", etTo.getText().toString());
new SimpleTask<EntityAnswer>() { new SimpleTask<EntityAnswer>() {
@Override @Override
protected EntityAnswer onExecute(Context context, Bundle args) throws Throwable { protected EntityAnswer onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id"); long id = args.getLong("id");
String to = args.getString("to");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityAnswer answer = db.answer().getAnswer(id); EntityAnswer answer = db.answer().getAnswer(id);
if (answer != null) if (answer != null) {
InternetAddress[] tos = null;
try {
tos = MessageHelper.parseAddresses(context, to);
} catch (AddressException ignored) {
}
String html = EntityAnswer.replacePlaceholders(context, answer.text, tos);
Document d = JsoupEx.parse(html);
d = HtmlHelper.sanitizeView(context, d, true);
Spanned spanned = HtmlHelper.fromDocument(context, d, new HtmlHelper.ImageGetterEx() {
@Override
public Drawable getDrawable(Element element) {
String source = element.attr("src");
if (source.startsWith("cid:"))
element.attr("src", "cid:");
return ImageHelper.decodeImage(context,
working, element, true, zoom, 1.0f, etBody);
}
}, null);
args.putCharSequence("spanned", spanned);
db.answer().applyAnswer(answer.id, new Date().getTime()); db.answer().applyAnswer(answer.id, new Date().getTime());
}
return answer; return answer;
} }
@ -2434,24 +2459,7 @@ public class FragmentCompose extends FragmentBase {
if (etSubject.getText().length() == 0) if (etSubject.getText().length() == 0)
etSubject.setText(answer.name); etSubject.setText(answer.name);
InternetAddress[] to = null; Spanned spanned = (Spanned) args.getCharSequence("spanned");
try {
to = MessageHelper.parseAddresses(getContext(), etTo.getText().toString());
} catch (AddressException ignored) {
}
String html = EntityAnswer.replacePlaceholders(context, answer.text, to);
Spanned spanned = HtmlHelper.fromHtml(html, new HtmlHelper.ImageGetterEx() {
@Override
public Drawable getDrawable(Element element) {
String source = element.attr("src");
if (source.startsWith("cid:"))
element.attr("src", "cid:");
return ImageHelper.decodeImage(getContext(),
working, element, true, zoom, 1.0f, etBody);
}
}, null, getContext());
int start = etBody.getSelectionStart(); int start = etBody.getSelectionStart();
int end = etBody.getSelectionEnd(); int end = etBody.getSelectionEnd();