Mercurial > libervia-backend

diff sat_frontends/bridge/dbus_bridge.py @ 2743:da59ff099b32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core (memory/encryption), plugin OTR: finished OTR integration in encryption: - messageEncryptionStart and messageEncryptionStop are now async - an encryption plugin can now have a startEncryption and endEncryption method, which are called automatically when suitable - trust is now put in "trusted" key of message_data, and markAsTrusted has been added, it is used in OTR - getTrustUI implemented for OTR, using legacy authenticate code - catch potr.crypt.InvalidParameterError on decryption - fixed some service OTR messages which were not correctly marked as not for storing, and thus were added to MAM archive/carbon copied - other bug fixes
author Goffi <goffi@goffi.org>
date Thu, 03 Jan 2019 21:00:00 +0100
parents e347e32aa07f
children 003b8b4b56a7
line wrap: on
line diff
--- a/sat_frontends/bridge/dbus_bridge.py	Thu Jan 03 20:51:08 2019 +0100
+++ b/sat_frontends/bridge/dbus_bridge.py	Thu Jan 03 21:00:00 2019 +0100
@@ -562,12 +562,7 @@
             if errback is None:
                 errback = log.error
             error_handler = lambda err:errback(dbus_to_bridge_exception(err))
-        kwargs={}
-        if callback is not None:
-            kwargs['timeout'] = const_TIMEOUT
-            kwargs['reply_handler'] = callback
-            kwargs['error_handler'] = error_handler
-        return self.db_core_iface.messageEncryptionStart(to_jid, namespace, replace, profile_key, **kwargs)
+        return self.db_core_iface.messageEncryptionStart(to_jid, namespace, replace, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
 
     def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None):
         if callback is None:
@@ -576,12 +571,7 @@
             if errback is None:
                 errback = log.error
             error_handler = lambda err:errback(dbus_to_bridge_exception(err))
-        kwargs={}
-        if callback is not None:
-            kwargs['timeout'] = const_TIMEOUT
-            kwargs['reply_handler'] = callback
-            kwargs['error_handler'] = error_handler
-        return self.db_core_iface.messageEncryptionStop(to_jid, profile_key, **kwargs)
+        return self.db_core_iface.messageEncryptionStop(to_jid, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
 
     def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None):
         if callback is None: