From 20962bdea85b9e0ac04ab9f714853ca8516cd7f4 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 3 Nov 2015 19:41:34 -0200 Subject: 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 --- service/pixelated/config/services.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'service/pixelated/config') 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, -- cgit v1.2.3