diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-11-04 10:11:19 +0100 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-11-04 12:02:53 +0100 |
| commit | d79aa00e3c24c5bf5e5ed5ba5a9b976f93034362 (patch) | |
| tree | 87a32a2e85d04b3bebc2ceb4aa56b447488940b6 /service/pixelated/config | |
| parent | ffa355c46eda5d05f25890420218845ac3e53f71 (diff) | |
Instantiate new MailSender in Services
- Issue #499
- Some smaller refactorings
- Extract smtp cert download to own class
Diffstat (limited to 'service/pixelated/config')
| -rw-r--r-- | service/pixelated/config/services.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 7c08d286..cd475228 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -1,7 +1,7 @@ from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore from pixelated.adapter.services.mail_service import MailService from pixelated.adapter.model.mail import InputMail -from pixelated.adapter.services.mail_sender import LocalSmtpMailSender # , MailSender +from pixelated.adapter.services.mail_sender import LocalSmtpMailSender, MailSender # , MailSender from pixelated.adapter.search import SearchEngine from pixelated.adapter.services.draft_service import DraftService from pixelated.adapter.listeners.mailbox_indexer_listener import listen_all_mailboxes @@ -55,17 +55,11 @@ class Services(object): self.search_engine = search_engine def setup_mail_service(self, leap_session, search_engine): - smtp_host, smtp_port = leap_session.provider.smtp_info() pixelated_mail_sender = LocalSmtpMailSender( leap_session.account_email(), leap_session.smtp) - # pixelated_mail_sender = MailSender( - # leap_session.account_email(), - # leap_session.nicknym, - # leap_session.provider.local_ca_crt, - # smtp_host, - # smtp_port) + MailSender(leap_session.smtp._smtp_config, leap_session.nicknym.keymanager) return MailService( pixelated_mail_sender, |