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

fix(GODT-2802): Fix missing key pass input for keyring unlock

Browse Source
This commit is contained in:
Leander Beernaert
2023-08-14 13:09:22 +02:00
parent 29f44fc312
commit cba73997cd
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/services/imapservice/service_sync.go
View File

@ -117,6 +117,7 @@ func (s *syncHandler) launch(service *Service) {
panicHandler: service.panicHandler, panicHandler: service.panicHandler,
reporter: service.reporter, reporter: service.reporter,
maxSyncMemory: service.maxSyncMemory, maxSyncMemory: service.maxSyncMemory,
keyProvider: service.identityState.keyPassProvider,
} }
s.group.Once(func(ctx context.Context) { s.group.Once(func(ctx context.Context) {

1
internal/services/imapservice/sync.go
View File

@ -50,6 +50,7 @@ type syncJob struct {
identityState *useridentity.State identityState *useridentity.State
panicHandler async.PanicHandler panicHandler async.PanicHandler
reporter reporter.Reporter reporter reporter.Reporter
keyProvider useridentity.KeyPassProvider
maxSyncMemory uint64 maxSyncMemory uint64
} }

2
internal/services/imapservice/sync_messages.go
View File

@ -381,7 +381,7 @@ func startMessageBuilder(ctx context.Context, s *syncJob, buildCh <-chan downloa
logrus.Debugf("sync builder exit") logrus.Debugf("sync builder exit")
}() }()
if err := s.identityState.WithAddrKRs(nil, func(_ *crypto.KeyRing, addrKRs map[string]*crypto.KeyRing) error { if err := s.identityState.WithAddrKRs(s.keyProvider.KeyPass(), func(_ *crypto.KeyRing, addrKRs map[string]*crypto.KeyRing) error {
maxMessagesInParallel := runtime.NumCPU() maxMessagesInParallel := runtime.NumCPU()
for buildBatch := range buildCh { for buildBatch := range buildCh {