yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-797 APPEND waits for EXPUNGE to prevent data loss when Outlook moves from Spam or Trash

Browse Source
This commit is contained in:
Michal Horejsek
2021-02-12 10:08:00 +01:00
parent bad8cad97d
commit e6ae344f1f
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/imap/mailbox_message.go
View File

@ -70,9 +70,6 @@ func (im *imapMailbox) CreateMessage(flags []string, date time.Time, body imap.L
// Called from go-imap in goroutines - we need to handle panics for each function.
defer im.panicHandler.HandlePanic()
im.user.appendStarted()
defer im.user.appendFinished()
m, _, _, readers, err := message.Parse(body)
if err != nil {
return err
@ -154,6 +151,9 @@ func (im *imapMailbox) CreateMessage(flags []string, date time.Time, body imap.L
}
}
im.user.appendExpungeLock.Lock()
defer im.user.appendExpungeLock.Unlock()
// Avoid appending a message which is already on the server. Apply the
// new label instead. This always happens with Outlook (it uses APPEND
// instead of COPY).