diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2015-11-03 19:41:34 -0200 |
|---|---|---|
| committer | Pixelated <pixelated@pix-poa-1> | 2015-11-03 19:47:35 -0200 |
| commit | 20962bdea85b9e0ac04ab9f714853ca8516cd7f4 (patch) | |
| tree | 595bea74597a2147b57afe4fde59a7ab1318018f /service/pixelated/config | |
| parent | 0f84c6354a116fd53628b23a56c1528c5dd3e8ef (diff) | |
Issue #499 Moved remote smtp configuration
We removed the common parts from the bitmask libraries smtp
and adapted the tests.
We also advanced the new mail sender implementation, but it
is coupled to the twisted.mail.smtp.User currently and we need
to adapt leap mail to remove this dependency
Diffstat (limited to 'service/pixelated/config')
| -rw-r--r-- | service/pixelated/config/services.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 23fd01d8..7c08d286 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 +from pixelated.adapter.services.mail_sender import LocalSmtpMailSender # , 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,11 +55,18 @@ class Services(object): self.search_engine = search_engine def setup_mail_service(self, leap_session, search_engine): - # if False: FIXME - # yield pixelated_mailboxes.add_welcome_mail_for_fresh_user() + 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) + return MailService( pixelated_mail_sender, leap_session.mail_store, |