Merge branch 'master' into floatlabel_for_compose

3 files changed, 16 insertions, 10 deletions

diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 7c4223de..464e0343 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -393,6 +393,10 @@ class PixelatedMail(Mail):
     def uid(self):
         return self.fdoc.content['uid']
 
+    @property
+    def flags(self):
+        return self.fdoc.content['flags']
+
     def save(self):
         return self.querier.save_mail(self)
 
@@ -407,21 +411,21 @@ class PixelatedMail(Mail):
         return self.tags
 
     def mark_as_read(self):
-        if Status.SEEN in self.fdoc.content['flags']:
+        if Status.SEEN in self.flags:
             return self
-        self.fdoc.content['flags'].append(Status.SEEN)
+        self.flags.append(Status.SEEN)
         self.save()
         return self
 
     def mark_as_unread(self):
-        if Status.SEEN in self.fdoc.content['flags']:
-            self.fdoc.content['flags'].remove(Status.SEEN)
+        if Status.SEEN in self.flags:
+            self.flags.remove(Status.SEEN)
             self.save()
         return self
 
     def mark_as_not_recent(self):
-        if Status.RECENT in self.fdoc.content['flags']:
-            self.fdoc.content['flags'].remove(Status.RECENT)
+        if Status.RECENT in self.flags:
+            self.flags.remove(Status.RECENT)
             self.save()
         return self
 
diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py
index da8845cc..b8d3e7ca 100644
--- a/service/pixelated/adapter/search/__init__.py
+++ b/service/pixelated/adapter/search/__init__.py
@@ -35,8 +35,8 @@ class SearchEngine(object):
     DEFAULT_INDEX_HOME = os.path.join(os.environ['HOME'], '.leap')
     DEFAULT_TAGS = ['inbox', 'sent', 'drafts', 'trash']
 
-    def __init__(self, soledad_querier, agent_home=DEFAULT_INDEX_HOME):
-        self.soledad_querier = soledad_querier
+    def __init__(self, key, agent_home=DEFAULT_INDEX_HOME):
+        self.key = key
         self.index_folder = os.path.join(agent_home, 'search_index')
         if not os.path.exists(self.index_folder):
             os.makedirs(self.index_folder)
@@ -111,8 +111,7 @@ class SearchEngine(object):
             raw=TEXT(stored=False))
 
     def _create_index(self):
-        masterkey = self.soledad_querier.get_index_masterkey()
-        storage = EncryptedFileStorage(self.index_folder, masterkey)
+        storage = EncryptedFileStorage(self.index_folder, self.key)
         return FileIndex.create(storage, self._mail_schema(), indexname='mails')
 
     def index_mail(self, mail):
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 4e6b6aa8..233d4d4a 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -60,6 +60,9 @@ class MailService(object):
     def mail(self, mail_id):
         return self.querier.mail(mail_id)
 
+    def attachment(self, attachment_id, encoding):
+        return self.querier.attachment(attachment_id, encoding)
+
     def mail_exists(self, mail_id):
         return not(not(self.querier.get_header_by_chash(mail_id)))