diff options
| -rw-r--r-- | service/pixelated/adapter/services/mail_service.py | 3 | ||||
| -rw-r--r-- | service/pixelated/adapter/soledad/soledad_facade_mixin.py | 1 | ||||
| -rw-r--r-- | service/pixelated/bitmask_libraries/session.py | 4 | ||||
| -rw-r--r-- | service/pixelated/bitmask_libraries/smtp.py | 2 | ||||
| -rw-r--r-- | service/pixelated/config/services.py | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index 3dfbc9a7..a22ca394 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -79,7 +79,8 @@ class MailService(object): draft_id = content_dict.get('ident') yield self.mail_sender.sendmail(mail) - yield self.move_to_sent(draft_id, mail) + sent_mail = yield self.move_to_sent(draft_id, mail) + defer.returnValue(sent_mail) @defer.inlineCallbacks def move_to_sent(self, last_draft_ident, mail): diff --git a/service/pixelated/adapter/soledad/soledad_facade_mixin.py b/service/pixelated/adapter/soledad/soledad_facade_mixin.py index 1f191ab2..0683a5bc 100644 --- a/service/pixelated/adapter/soledad/soledad_facade_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_facade_mixin.py @@ -80,6 +80,7 @@ class SoledadDbFacadeMixin(object): mbox = (yield defer.maybeDeferred(self.get_mbox, mbox))[0] indexer = MailboxIndexer(self.soledad) + indexer.create_table(mbox.content['uuid']) last_uuid = yield indexer.get_last_uid(mbox.content['uuid']) defer.returnValue(last_uuid) diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py index 925af0c0..60084731 100644 --- a/service/pixelated/bitmask_libraries/session.py +++ b/service/pixelated/bitmask_libraries/session.py @@ -25,6 +25,7 @@ from leap.auth import SRPAuth from .soledad import SoledadSessionFactory from .smtp import LeapSmtp from leap.mail.imap.account import IMAPAccount +from twisted.internet import defer SESSIONS = {} @@ -114,8 +115,7 @@ class LeapSessionFactory(object): account = self._create_account(account_email, soledad) incoming_mail_fetcher = self._create_incoming_mail_fetcher(nicknym, soledad, auth, auth.username) - # smtp = LeapSmtp(self._provider, auth, nicknym.keymanager) - smtp = None + smtp = LeapSmtp(self._provider, auth, nicknym.keymanager) return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher, smtp) diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py index 31e56995..ff2792fb 100644 --- a/service/pixelated/bitmask_libraries/smtp.py +++ b/service/pixelated/bitmask_libraries/smtp.py @@ -88,7 +88,7 @@ class LeapSmtp(object): self._local_smtp_service, self._local_smtp_service_socket = setup_smtp_gateway( port=self.local_smtp_port_number, - userid=email, + userid=str(email), keymanager=self._keymanager, smtp_host=self._remote_hostname.encode('UTF-8'), smtp_port=self._remote_port, diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 18e0295d..f04a2560 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -45,7 +45,7 @@ class Services(object): self.search_engine.index_mails( mails=(yield self.mail_service.all_mails())) yield soledad_querier.mark_all_as_not_recent() - # soledad_querier.remove_duplicates() FIXME should be re-enabled + soledad_querier.remove_duplicates() InputMail.FROM_EMAIL_ADDRESS = leap_session.account_email() def setup_keymanager(self, leap_session): |