Migrate ImapAccount to Account

Migrate all usage of leap.ImapAccount to leap.Account
We had to adapt some calls because of signature changes and, because
we need the Account to be initialized before moving on, we are directly
using the deferred initialization that the account has

See: https://github.com/leapcode/leap_mail/pull/228

1 files changed, 4 insertions, 5 deletions

diff --git a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
index 74b4f5af..97a887f4 100644
--- a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
+++ b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py
@@ -27,9 +27,8 @@ class MailboxIndexerListener(object):
     @defer.inlineCallbacks
     def listen(cls, account, mailbox_name, mail_store, search_engine):
         listener = MailboxIndexerListener(mailbox_name, mail_store, search_engine)
-        if listener not in (yield account.getMailbox(mailbox_name)).listeners:
-            mbx = yield account.getMailbox(mailbox_name)
-            mbx.addListener(listener)
+        mail_collection = yield account.get_collection_by_mailbox(mailbox_name)
+        mail_collection.addListener(listener)
 
         defer.returnValue(listener)
 
@@ -39,7 +38,7 @@ class MailboxIndexerListener(object):
         self.search_engine = search_engine
 
     @defer.inlineCallbacks
-    def newMessages(self, exists, recent):
+    def notify_new(self):
         try:
             indexed_idents = set(self.search_engine.search('tag:' + self.mailbox_name.lower(), all_mails=True))
             soledad_idents = yield self.mail_store.get_mailbox_mail_ids(self.mailbox_name)
@@ -63,6 +62,6 @@ class MailboxIndexerListener(object):
 
 @defer.inlineCallbacks
 def listen_all_mailboxes(account, search_engine, mail_store):
-    mailboxes = yield account.account.list_all_mailbox_names()
+    mailboxes = yield account.list_all_mailbox_names()
     for mailbox_name in mailboxes:
         yield MailboxIndexerListener.listen(account, mailbox_name, mail_store, search_engine)