msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Skip update draft on delete

Browse Source
pull/147/head
M66B 6 years ago
parent 4a7974e7e2
commit 5b3626bebf
1 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File

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

@ -1921,92 +1921,94 @@ public class FragmentCompose extends FragmentEx {
Log.i("Load action id=" + draft.id + " action=" + action);
// Move draft to new account
if (draft.account != aid && aid >= 0) {
Long uid = draft.uid;
String msgid = draft.msgid;
draft.uid = null;
draft.msgid = null;
db.message().updateMessage(draft);
if (action != R.id.action_delete) {
// Move draft to new account
if (draft.account != aid && aid >= 0) {
Long uid = draft.uid;
String msgid = draft.msgid;
draft.uid = null;
draft.msgid = null;
db.message().updateMessage(draft);
draft.id = null;
draft.uid = uid;
draft.msgid = msgid;
draft.content = false;
draft.ui_hide = true;
draft.id = db.message().insertMessage(draft);
EntityOperation.queue(context, db, draft, EntityOperation.DELETE);
draft.id = id;
draft.account = aid;
draft.folder = db.folder().getFolderByType(aid, EntityFolder.DRAFTS).id;
draft.content = true;
draft.ui_hide = false;
EntityOperation.queue(context, db, draft, EntityOperation.ADD);
}
draft.id = null;
draft.uid = uid;
draft.msgid = msgid;
draft.content = false;
draft.ui_hide = true;
draft.id = db.message().insertMessage(draft);
EntityOperation.queue(context, db, draft, EntityOperation.DELETE);
// Get data
InternetAddress afrom[] = (identity == null ? null : new InternetAddress[]{new InternetAddress(identity.email, identity.name)});
draft.id = id;
draft.account = aid;
draft.folder = db.folder().getFolderByType(aid, EntityFolder.DRAFTS).id;
draft.content = true;
draft.ui_hide = false;
EntityOperation.queue(context, db, draft, EntityOperation.ADD);
}
InternetAddress ato[] = null;
InternetAddress acc[] = null;
InternetAddress abcc[] = null;
// Convert data
InternetAddress afrom[] = (identity == null ? null : new InternetAddress[]{new InternetAddress(identity.email, identity.name)});
if (!TextUtils.isEmpty(to))
try {
ato = InternetAddress.parse(to);
} catch (AddressException ignored) {
}
InternetAddress ato[] = null;
InternetAddress acc[] = null;
InternetAddress abcc[] = null;
if (!TextUtils.isEmpty(cc))
try {
acc = InternetAddress.parse(cc);
} catch (AddressException ignored) {
}
if (!TextUtils.isEmpty(to))
try {
ato = InternetAddress.parse(to);
} catch (AddressException ignored) {
}
if (!TextUtils.isEmpty(bcc))
try {
abcc = InternetAddress.parse(bcc);
} catch (AddressException ignored) {
}
if (!TextUtils.isEmpty(cc))
try {
acc = InternetAddress.parse(cc);
} catch (AddressException ignored) {
}
if (TextUtils.isEmpty(extra))
extra = null;
Long ident = (identity == null ? null : identity.id);
dirty = dirty ||
((draft.identity == null ? ident != null : !draft.identity.equals(ident)) ||
(draft.extra == null ? extra != null : !draft.extra.equals(extra)) ||
!MessageHelper.equal(draft.from, afrom) ||
!MessageHelper.equal(draft.to, ato) ||
!MessageHelper.equal(draft.cc, acc) ||
!MessageHelper.equal(draft.bcc, abcc) ||
(draft.subject == null ? subject != null : !draft.subject.equals(subject)));
// Update draft
draft.identity = ident;
draft.extra = extra;
draft.sender = MessageHelper.getSortKey(afrom);
draft.from = afrom;
draft.to = ato;
draft.cc = acc;
draft.bcc = abcc;
draft.subject = subject;
draft.received = new Date().getTime();
if (action == R.id.action_send)
if (draft.replying != null || draft.forwarding != null)
body += HtmlHelper.getQuote(context,
draft.replying == null ? draft.forwarding : draft.replying, false);
dirty = (dirty || !body.equals(draft.read(context)));
if (!TextUtils.isEmpty(bcc))
try {
abcc = InternetAddress.parse(bcc);
} catch (AddressException ignored) {
if (dirty) {
db.message().updateMessage(draft);
draft.write(context, body);
db.message().setMessageContent(
draft.id, true, HtmlHelper.getPreview(body));
}
if (TextUtils.isEmpty(extra))
extra = null;
Long ident = (identity == null ? null : identity.id);
dirty = dirty ||
((draft.identity == null ? ident != null : !draft.identity.equals(ident)) ||
(draft.extra == null ? extra != null : !draft.extra.equals(extra)) ||
!MessageHelper.equal(draft.from, afrom) ||
!MessageHelper.equal(draft.to, ato) ||
!MessageHelper.equal(draft.cc, acc) ||
!MessageHelper.equal(draft.bcc, abcc) ||
(draft.subject == null ? subject != null : !draft.subject.equals(subject)));
// Update draft
draft.identity = ident;
draft.extra = extra;
draft.sender = MessageHelper.getSortKey(afrom);
draft.from = afrom;
draft.to = ato;
draft.cc = acc;
draft.bcc = abcc;
draft.subject = subject;
draft.received = new Date().getTime();
if (action == R.id.action_send)
if (draft.replying != null || draft.forwarding != null)
body += HtmlHelper.getQuote(context,
draft.replying == null ? draft.forwarding : draft.replying, false);
dirty = (dirty || !body.equals(draft.read(context)));
if (dirty) {
db.message().updateMessage(draft);
draft.write(context, body);
db.message().setMessageContent(
draft.id, true, HtmlHelper.getPreview(body));
}
// Execute action

Write Preview
Loading…
Cancel
Save