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

Refactoring

This commit is contained in:
M66B 2019-05-22 21:34:35 +02:00
parent c74f32f1e7
commit 1d4b953daa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -3169,6 +3169,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
new SimpleTask<List<EntityFolder>>() { new SimpleTask<List<EntityFolder>>() {
@Override @Override
protected List<EntityFolder> onExecute(Context context, Bundle args) { protected List<EntityFolder> onExecute(Context context, Bundle args) {
long id = args.getLong("id");
EntityMessage message; EntityMessage message;
List<EntityFolder> folders = null; List<EntityFolder> folders = null;
@ -3176,14 +3178,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
try { try {
db.beginTransaction(); db.beginTransaction();
message = db.message().getMessage(args.getLong("id")); message = db.message().getMessage(id);
if (message == null) if (message == null)
return null; return null;
EntityFolder folder = db.folder().getFolder(message.folder); EntityFolder folder = db.folder().getFolder(message.folder);
if (EntityFolder.OUTBOX.equals(folder.type)) { if (EntityFolder.OUTBOX.equals(folder.type)) {
long id = message.id;
File source = message.getFile(context); File source = message.getFile(context);
// Insert into drafts // Insert into drafts
@ -3196,14 +3196,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
File target = message.getFile(context); File target = message.getFile(context);
source.renameTo(target); source.renameTo(target);
List<EntityAttachment> attachments = db.attachment().getAttachments(id); List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
for (EntityAttachment attachment : attachments) for (EntityAttachment attachment : attachments)
db.attachment().setMessage(attachment.id, message.id); db.attachment().setMessage(attachment.id, message.id);
EntityOperation.queue(context, message, EntityOperation.ADD); EntityOperation.queue(context, message, EntityOperation.ADD);
// Delete from outbox // Delete from outbox
db.message().deleteMessage(id); db.message().deleteMessage(message.id);
} else } else
folders = db.folder().getFolders(message.account); folders = db.folder().getFolders(message.account);