Philipp Hörist pushed to branch omemo_integration at gajim / gajim

Commits: 52aa4b5b by Philipp Hörist at 2022-10-22T15:11:10+02:00 refactor: Remove unused code

- - - - - 95399b48 by Philipp Hörist at 2022-10-22T15:26:00+02:00 refactor: Use send_stanza method

- - - - -

1 changed file:

- gajim/common/modules/omemo.py

Changes:

===================================== gajim/common/modules/omemo.py ===================================== @@ -91,12 +91,6 @@ ('origin-id', Namespace.SID), ]

-ENCRYPTION_NAME = 'OMEMO' - -# Module name -name = 'OMEMO' -zeroconf = False -

class OMEMO(BaseModule):

@@ -129,7 +123,6 @@ def __init__(self, client: types.Client) -> None: ('muc-added', ged.GUI1, self._on_muc_added) ])

- self.encryption_name = 'OMEMO' self.allow_groupchat = True

self._own_jid = self._client.get_own_jid().bare @@ -272,9 +265,8 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: self._muc_temp_store[omemo_message.payload] = event.message else: event.xhtml = None - event.encrypted = ENCRYPTION_NAME event.additional_data['encrypted'] = { - 'name': ENCRYPTION_NAME, + 'name': 'OMEMO', 'trust': GajimTrust[Trust.VERIFIED.name]}

self._debug_print_stanza(event.stanza) @@ -319,7 +311,7 @@ def _send_key_transport_message(self,

transport_message = get_key_transport_message(typ, jid, omemo_message) self._log.info('Send key transport message %s (%s)', jid, devices) - self._client.connection.send(transport_message) + self._client.send_stanza(transport_message)

def _message_received(self, _client: types.xmppClient, @@ -385,7 +377,7 @@ def _message_received(self, prepare_stanza(stanza, plaintext) self._debug_print_stanza(stanza) properties.encrypted = EncryptionData({ - 'name': ENCRYPTION_NAME, + 'name': 'OMEMO', 'fingerprint': fingerprint, 'trust': GajimTrust[trust.name]})

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e3b156bb401ead7f3825324c4e4d4f4...