Mercurial > libervia-backend

diff sat/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/bridge/dbus_bridge.py	Thu Jan 03 20:51:08 2019 +0100
+++ b/sat/bridge/dbus_bridge.py	Thu Jan 03 21:00:00 2019 +0100
@@ -423,15 +423,15 @@
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ssbs', out_signature='',
-                         async_callbacks=None)
-    def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@"):
-        return self._callback("messageEncryptionStart", unicode(to_jid), unicode(namespace), replace, unicode(profile_key))
+                         async_callbacks=('callback', 'errback'))
+    def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None):
+        return self._callback("messageEncryptionStart", unicode(to_jid), unicode(namespace), replace, unicode(profile_key), callback=callback, errback=errback)
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ss', out_signature='',
-                         async_callbacks=None)
-    def messageEncryptionStop(self, to_jid, profile_key):
-        return self._callback("messageEncryptionStop", unicode(to_jid), unicode(profile_key))
+                         async_callbacks=('callback', 'errback'))
+    def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None):
+        return self._callback("messageEncryptionStop", unicode(to_jid), unicode(profile_key), callback=callback, errback=errback)
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='sa{ss}a{ss}sa{ss}s', out_signature='',