diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/mx/mail_receiver.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index c90dda9..7836ab2 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -39,13 +39,12 @@ from twisted.internet import inotify, defer, task from twisted.python import filepath, log from leap.common.mail import get_email_charset -from leap.soledad.common.document import SoledadDocument from leap.soledad.common.crypto import ( EncryptionSchemes, ENC_JSON_KEY, ENC_SCHEME_KEY, ) -from leap.soledad.common.couch import CouchDatabase +from leap.soledad.common.couch import CouchDatabase, CouchDocument from leap.keymanager import openpgp @@ -109,7 +108,7 @@ class MailReceiver(Service): :return: doc to sync with Soledad or None, None if something went wrong. - :rtype: SoledadDocument + :rtype: CouchDocument """ if pubkey is None or len(pubkey) == 0: log.msg("_encrypt_message: Something went wrong, here's all " @@ -125,7 +124,7 @@ class MailReceiver(Service): result = chardet.detect(message_as_string) encoding = result["encoding"] - doc = SoledadDocument(doc_id=str(pyuuid.uuid4())) + doc = CouchDocument(doc_id=str(pyuuid.uuid4())) # store plain text if pubkey is not available data = {'incoming': True, 'content': message_as_string} @@ -167,14 +166,14 @@ class MailReceiver(Service): def _export_message(self, uuid, doc): """ - Given a UUID and a SoledadDocument, it saves it directly in the + Given a UUID and a CouchDocument, it saves it directly in the couchdb that serves as a backend for Soledad, in a db accessible to the recipient of the mail. :param uuid: the mail owner's uuid :type uuid: str - :param doc: SoledadDocument that represents the email - :type doc: SoledadDocument + :param doc: CouchDocument that represents the email + :type doc: CouchDocument :return: True if it's ok to remove the message, False otherwise |