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

GODT-2252: Recover from deleted cached messages

Browse Source 
Update to latest Gluon version and implement the new
`Connector.GetMessageLiteral` function.
This commit is contained in:
Leander Beernaert
2023-01-17 13:38:06 +01:00
parent fe009ca235
commit 0e9428aaae
6 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/user/imap.go
View File

@ -321,6 +321,29 @@ func (conn *imapConnector) CreateMessage(
return conn.importMessage(ctx, literal, wantLabelIDs, wantFlags, unread)
}
func (conn *imapConnector) GetMessageLiteral(ctx context.Context, id imap.MessageID) ([]byte, error) {
msg, err := conn.client.GetFullMessage(ctx, string(id))
if err != nil {
return nil, err
}
return safe.RLockRetErr(func() ([]byte, error) {
var literal []byte
err := withAddrKR(conn.apiUser, conn.apiAddrs[msg.AddressID], conn.vault.KeyPass(), func(_, addrKR *crypto.KeyRing) error {
l, buildErr := message.BuildRFC822(addrKR, msg.Message, msg.AttData, defaultJobOpts())
if buildErr != nil {
return buildErr
}
literal = l
return nil
})
return literal, err
}, conn.apiUserLock, conn.apiAddrsLock)
}
// AddMessagesToMailbox labels the given messages with the given label ID.
func (conn *imapConnector) AddMessagesToMailbox(ctx context.Context, messageIDs []imap.MessageID, mailboxID imap.MailboxID) error {
defer conn.goPollAPIEvents(false)