Send fixes

This commit is contained in:
M66B
2019-09-02 10:48:11 +02:00
parent 03f97c7e3b
commit 91e9212289
4 changed files with 23 additions and 13 deletions

View File

@@ -375,14 +375,8 @@ public class ServiceSend extends ServiceBase {
message.error = null;
message.id = db.message().insertMessage(message);
MessageHelper.MessageParts parts = helper.getMessageParts();
String body = parts.getHtml(this);
Helper.writeText(message.getFile(this), body);
db.message().setMessageContent(message.id,
true,
parts.isPlainOnly(),
HtmlHelper.getPreview(body),
parts.getWarnings(message.warning));
message.getFile(this).createNewFile();
EntityAttachment.copy(this, id, message.id);
sid = message.id;
message.id = id;
@@ -412,6 +406,16 @@ public class ServiceSend extends ServiceBase {
db.message().deleteMessage(message.id);
if (sid != null) {
MessageHelper helper = new MessageHelper(imessage);
MessageHelper.MessageParts parts = helper.getMessageParts();
String body = parts.getHtml(this);
Helper.writeText(EntityMessage.getFile(this, sid), body);
db.message().setMessageContent(message.id,
true,
parts.isPlainOnly(),
HtmlHelper.getPreview(body),
parts.getWarnings(message.warning));
db.message().setMessageSent(sid, time);
db.message().setMessageUiHide(sid, 0L);
}