diff options
| author | Kali Kaneko <kali@leap.se> | 2016-03-23 12:03:46 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-03-23 12:03:46 -0400 |
| commit | e92e4f1e4d57957af5d8c9e08a6c3c9152409612 (patch) | |
| tree | 20e14e218fc08ba07c1f48c3a31869350391c1cd /src/leap/bitmask/services/mail | |
| parent | c866892b988912a5b9a88edfd6d1e71491617822 (diff) | |
[feature] allow to disable pixelmail integration
Diffstat (limited to 'src/leap/bitmask/services/mail')
| -rw-r--r-- | src/leap/bitmask/services/mail/conductor.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py index 05fafa1a..cccbcf14 100644 --- a/src/leap/bitmask/services/mail/conductor.py +++ b/src/leap/bitmask/services/mail/conductor.py @@ -18,6 +18,7 @@ Mail Services Conductor """ from leap.bitmask.config import flags +from leap.bitmask.config.leapsettings import LeapSettings from leap.bitmask.logs.utils import get_logger from leap.bitmask.gui import statemachines from leap.bitmask.services.mail import connection as mail_connection @@ -279,8 +280,10 @@ class MailConductor(IMAPControl, SMTPControl, PixelatedControl): self.start_smtp_service(download_if_needed=download_if_needed) self.start_imap_service() - # TODO --- check if it's enabled!!! - self.start_pixelated_service() + settings = LeapSettings() + pixelmail = settings.get_pixelmail_enabled() + if pixelmail: + self.start_pixelated_service() self._mail_services_started = True |