| ... |
... |
@@ -91,12 +91,6 @@ |
|
91
|
91
|
('origin-id', Namespace.SID),
|
|
92
|
92
|
]
|
|
93
|
93
|
|
|
94
|
|
-ENCRYPTION_NAME = 'OMEMO'
|
|
95
|
|
-
|
|
96
|
|
-# Module name
|
|
97
|
|
-name = 'OMEMO'
|
|
98
|
|
-zeroconf = False
|
|
99
|
|
-
|
|
100
|
94
|
|
|
101
|
95
|
class OMEMO(BaseModule):
|
|
102
|
96
|
|
| ... |
... |
@@ -129,7 +123,6 @@ def __init__(self, client: types.Client) -> None: |
|
129
|
123
|
('muc-added', ged.GUI1, self._on_muc_added)
|
|
130
|
124
|
])
|
|
131
|
125
|
|
|
132
|
|
- self.encryption_name = 'OMEMO'
|
|
133
|
126
|
self.allow_groupchat = True
|
|
134
|
127
|
|
|
135
|
128
|
self._own_jid = self._client.get_own_jid().bare
|
| ... |
... |
@@ -272,9 +265,8 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: |
|
272
|
265
|
self._muc_temp_store[omemo_message.payload] = event.message
|
|
273
|
266
|
else:
|
|
274
|
267
|
event.xhtml = None
|
|
275
|
|
- event.encrypted = ENCRYPTION_NAME
|
|
276
|
268
|
event.additional_data['encrypted'] = {
|
|
277
|
|
- 'name': ENCRYPTION_NAME,
|
|
|
269
|
+ 'name': 'OMEMO',
|
|
278
|
270
|
'trust': GajimTrust[Trust.VERIFIED.name]}
|
|
279
|
271
|
|
|
280
|
272
|
self._debug_print_stanza(event.stanza)
|
| ... |
... |
@@ -319,7 +311,7 @@ def _send_key_transport_message(self, |
|
319
|
311
|
|
|
320
|
312
|
transport_message = get_key_transport_message(typ, jid, omemo_message)
|
|
321
|
313
|
self._log.info('Send key transport message %s (%s)', jid, devices)
|
|
322
|
|
- self._client.connection.send(transport_message)
|
|
|
314
|
+ self._client.send_stanza(transport_message)
|
|
323
|
315
|
|
|
324
|
316
|
def _message_received(self,
|
|
325
|
317
|
_client: types.xmppClient,
|
| ... |
... |
@@ -385,7 +377,7 @@ def _message_received(self, |
|
385
|
377
|
prepare_stanza(stanza, plaintext)
|
|
386
|
378
|
self._debug_print_stanza(stanza)
|
|
387
|
379
|
properties.encrypted = EncryptionData({
|
|
388
|
|
- 'name': ENCRYPTION_NAME,
|
|
|
380
|
+ 'name': 'OMEMO',
|
|
389
|
381
|
'fingerprint': fingerprint,
|
|
390
|
382
|
'trust': GajimTrust[trust.name]})
|
|
391
|
383
|
|