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

Restored compose logic

This commit is contained in:
M66B 2018-08-24 12:32:11 +00:00
parent 9b61405891
commit a981e6fe08
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,9 +872,14 @@ public class FragmentCompose extends FragmentEx {
String subject = args.getString("subject");
String body = args.getString("body");
// Get draft & selected identity
EntityMessage draft;
DB db = DB.getInstance(context);
EntityMessage draft = db.message().getMessage(id);
try {
db.beginTransaction();
// Get draft & selected identity
draft = db.message().getMessage(id);
EntityIdentity identity = db.identity().getIdentity(iid);
// Draft deleted by server
@ -900,9 +905,6 @@ public class FragmentCompose extends FragmentEx {
String pbody = "<pre>" + body.replaceAll("\\r?\\n", "<br />") + "</pre>";
try {
db.beginTransaction();
// Execute action
if (action == R.id.action_trash) {
draft.ui_seen = true;
@ -932,13 +934,11 @@ public class FragmentCompose extends FragmentEx {
draft.write(context, pbody);
// Check data
if (action == R.id.action_send) {
if (draft.identity == null)
throw new IllegalArgumentException(context.getString(R.string.title_from_missing));
if (draft.to == null && draft.cc == null && draft.bcc == null)
throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
}
// Save message ID
String msgid = draft.msgid;