Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 07:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added detach operation

Browse Source
This commit is contained in:
M66B
2023-06-21 17:26:53 +02:00
parent 7d1ca2840f
commit 68e32b3976
3 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/AdapterAttachment.java
View File

@@ -366,8 +366,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
EntityMessage message = db.message().getMessage(attachment.message);
if (message == null)
return null;
EntityOperation.queue(context, message, EntityOperation.ATTACHMENT, attachment.id, true);
db.message().setMessageUiHide(message.id, true);
EntityOperation.queue(context, message, EntityOperation.DETACH, attachment.id, true);
} else
db.attachment().deleteAttachment(attachment.id);

66
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -507,6 +507,10 @@ class Core {
onAttachment(context, jargs, folder, message, op, (IMAPFolder) ifolder);
break;
case EntityOperation.DETACH:
onDetach(context, jargs, folder, message, op, (IMAPFolder) ifolder);
break;
case EntityOperation.EXISTS:
onExists(context, jargs, account, folder, message, op, (IMAPFolder) ifolder);
break;
@@ -2056,7 +2060,6 @@ class Core {
DB db = DB.getInstance(context);
long id = jargs.getLong(0);
boolean delete = jargs.optBoolean(1, false);
// Get attachment
EntityAttachment attachment = db.attachment().getAttachment(id);
@@ -2066,7 +2069,7 @@ class Core {
throw new IllegalArgumentException("Local attachment not found");
if (attachment.subsequence != null)
throw new IllegalArgumentException("Download of sub attachment");
if (attachment.available && !delete)
if (attachment.available)
return;
if (message.uid == null)
throw new IllegalArgumentException("Attachment/message uid missing");
@@ -2076,33 +2079,48 @@ class Core {
if (imessage == null)
throw new MessageRemovedException();
if (delete) {
MimeMessage icopy = new MimeMessageEx((MimeMessage) imessage, message.msgid);
MessageHelper helper = new MessageHelper(icopy, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
List<MessageHelper.AttachmentPart> aparts = parts.getAttachmentParts();
// Get message parts
MessageHelper helper = new MessageHelper((MimeMessage) imessage, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
if (attachment.sequence > aparts.size())
throw new IllegalArgumentException("Invalid attachment sequence=" + attachment.sequence + "/" + aparts.size());
Part apart = aparts.get(attachment.sequence - 1).part;
if (!deletePart(icopy, apart))
throw new IllegalArgumentException("Attachment part not found");
// Download attachment
parts.downloadAttachment(context, attachment, folder);
ifolder.appendMessages(new Message[]{icopy});
if (attachment.size != null)
EntityLog.log(context, "Operation attachment size=" + attachment.size);
}
imessage.setFlag(Flags.Flag.DELETED, true);
expunge(context, ifolder, Arrays.asList(imessage));
} else {
// Get message parts
MessageHelper helper = new MessageHelper((MimeMessage) imessage, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
private static void onDetach(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws JSONException, MessagingException, IOException {
DB db = DB.getInstance(context);
// Download attachment
parts.downloadAttachment(context, attachment, folder);
long id = jargs.getLong(0);
if (attachment.size != null)
EntityLog.log(context, "Operation attachment size=" + attachment.size);
}
if (message.uid == null)
throw new IllegalArgumentException("Delete attachments uid missing");
// Get message
Message imessage = ifolder.getMessageByUID(message.uid);
if (imessage == null)
throw new MessageRemovedException();
String msgid = EntityMessage.generateMessageId();
MimeMessage icopy = new MimeMessageEx((MimeMessage) imessage, msgid);
MessageHelper helper = new MessageHelper(icopy, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
List<MessageHelper.AttachmentPart> aparts = parts.getAttachmentParts();
List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
for (EntityAttachment attachment : attachments)
if (attachment.id.equals(id) && BuildConfig.DEBUG) {
Part apart = aparts.get(attachment.sequence - 1).part;
if (!deletePart(icopy, apart))
throw new IllegalArgumentException("Attachment part not found");
}
ifolder.appendMessages(new Message[]{icopy});
imessage.setFlag(Flags.Flag.DELETED, true);
expunge(context, ifolder, Arrays.asList(imessage));
}
static boolean deletePart(Part part, Part attachment) throws MessagingException, IOException {

11
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@@ -97,6 +97,7 @@ public class EntityOperation {
static final String RAW = "raw";
static final String BODY = "body";
static final String ATTACHMENT = "attachment";
static final String DETACH = "detach";
static final String SYNC = "sync";
static final String SUBSCRIBE = "subscribe";
static final String SEND = "send";
@@ -525,11 +526,11 @@ public class EntityOperation {
}
}
*/
} else if (ATTACHMENT.equals(name)) {
boolean delete = jargs.optBoolean(1, false);
if (!delete)
db.attachment().setProgress(jargs.getLong(0), 0);
}
} else if (ATTACHMENT.equals(name))
db.attachment().setProgress(jargs.getLong(0), 0);
else if (DETACH.equals(name))
db.message().setMessageUiHide(message.id, true);
queue(context, message.account, message.folder, message.id, name, jargs);