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

Other: setMailServerSettings is async as it should.

Browse Source
This commit is contained in:
Xavier Michelon
2022-11-29 13:31:12 +01:00
parent 7533dc952d
commit 2cce1c7b2a
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
internal/frontend/grpc/service_methods.go
View File

@ -640,37 +640,41 @@ func (s *Service) SetMailServerSettings(_ context.Context, settings *ImapSmtpSet
WithField("UseSSLForSMTP", settings.UseSSLForSmtp). WithField("UseSSLForSMTP", settings.UseSSLForSmtp).
Debug("SetConnectionMode") Debug("SetConnectionMode")
defer func() { _ = s.SendEvent(NewChangeMailServerSettingsFinishedEvent()) }() go func() {
defer s.panicHandler.HandlePanic()
if s.bridge.GetIMAPSSL() != settings.UseSSLForImap { defer func() { _ = s.SendEvent(NewChangeMailServerSettingsFinishedEvent()) }()
if err := s.bridge.SetIMAPSSL(settings.UseSSLForImap); err != nil {
s.log.WithError(err).Error("Failed to set IMAP SSL") if s.bridge.GetIMAPSSL() != settings.UseSSLForImap {
_ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_IMAP_CONNECTION_MODE_CHANGE_ERROR)) if err := s.bridge.SetIMAPSSL(settings.UseSSLForImap); err != nil {
s.log.WithError(err).Error("Failed to set IMAP SSL")
_ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_IMAP_CONNECTION_MODE_CHANGE_ERROR))
}
} }
}
if s.bridge.GetSMTPSSL() != settings.UseSSLForSmtp { if s.bridge.GetSMTPSSL() != settings.UseSSLForSmtp {
if err := s.bridge.SetSMTPSSL(settings.UseSSLForSmtp); err != nil { if err := s.bridge.SetSMTPSSL(settings.UseSSLForSmtp); err != nil {
s.log.WithError(err).Error("Failed to set SMTP SSL") s.log.WithError(err).Error("Failed to set SMTP SSL")
_ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_SMTP_CONNECTION_MODE_CHANGE_ERROR)) _ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_SMTP_CONNECTION_MODE_CHANGE_ERROR))
}
} }
}
if s.bridge.GetIMAPPort() != int(settings.ImapPort) { if s.bridge.GetIMAPPort() != int(settings.ImapPort) {
if err := s.bridge.SetIMAPPort(int(settings.ImapPort)); err != nil { if err := s.bridge.SetIMAPPort(int(settings.ImapPort)); err != nil {
s.log.WithError(err).Error("Failed to set IMAP port") s.log.WithError(err).Error("Failed to set IMAP port")
_ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_IMAP_PORT_CHANGE_ERROR)) _ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_IMAP_PORT_CHANGE_ERROR))
}
} }
}
if s.bridge.GetSMTPPort() != int(settings.SmtpPort) { if s.bridge.GetSMTPPort() != int(settings.SmtpPort) {
if err := s.bridge.SetSMTPPort(int(settings.SmtpPort)); err != nil { if err := s.bridge.SetSMTPPort(int(settings.SmtpPort)); err != nil {
s.log.WithError(err).Error("Failed to set SMTP port") s.log.WithError(err).Error("Failed to set SMTP port")
_ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_SMTP_PORT_CHANGE_ERROR)) _ = s.SendEvent(NewMailServerSettingsErrorEvent(MailServerSettingsErrorType_SMTP_PORT_CHANGE_ERROR))
}
} }
}
_ = s.SendEvent(NewMailServerSettingsChangedEvent(s.getMailServerSettings())) _ = s.SendEvent(NewMailServerSettingsChangedEvent(s.getMailServerSettings()))
}()
return &emptypb.Empty{}, nil return &emptypb.Empty{}, nil
} }