summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/core')
-rw-r--r--src/leap/bitmask/core/mail_services.py20
-rw-r--r--src/leap/bitmask/core/service.py2
2 files changed, 12 insertions, 10 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 68cb444..72a3512 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -29,17 +29,19 @@ from twisted.application import service
from twisted.internet import defer
from twisted.python import log
-from leap.bonafide import config
+# TODO move to bitmask.common
from leap.common.service_hooks import HookableService
-from leap.keymanager import KeyManager
-from leap.keymanager.errors import KeyNotFound
-from leap.keymanager.validation import ValidationLevels
+from leap.bitmask.bonafide import config
+from leap.bitmask.keymanager import KeyManager
+from leap.bitmask.keymanager.errors import KeyNotFound
+from leap.bitmask.keymanager.validation import ValidationLevels
+from leap.bitmask.mail.constants import INBOX_NAME
+from leap.bitmask.mail.mail import Account
+from leap.bitmask.mail.imap.service import imap
+from leap.bitmask.mail.incoming.service import IncomingMail
+from leap.bitmask.mail.incoming.service import INCOMING_CHECK_PERIOD
+from leap.bitmask.mail import smtp
from leap.soledad.client.api import Soledad
-from leap.mail.constants import INBOX_NAME
-from leap.mail.mail import Account
-from leap.mail.imap.service import imap
-from leap.mail.incoming.service import IncomingMail, INCOMING_CHECK_PERIOD
-from leap.mail import smtp
from leap.bitmask.core.uuid_map import UserMap
from leap.bitmask.core.configurable import DEFAULT_BASEDIR
diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py
index 99132c2..79465a8 100644
--- a/src/leap/bitmask/core/service.py
+++ b/src/leap/bitmask/core/service.py
@@ -35,7 +35,7 @@ backend = flags.BACKEND
if backend == 'default':
from leap.bitmask.core import mail_services
- from leap.bonafide.service import BonafideService
+ from leap.bitmask.bonafide.service import BonafideService
elif backend == 'dummy':
from leap.bitmask.core.dummy import mail_services
from leap.bitmask.core.dummy import BonafideService