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

Commits: 3a3ea83a by Philipp Hörist at 2023-05-06T23:44:36+02:00 refactor: OMEMO: Adapt to omemo-dr changes

- - - - -

3 changed files:

- gajim/common/modules/omemo.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py

Changes:

===================================== gajim/common/modules/omemo.py ===================================== @@ -377,7 +377,7 @@ def _message_received(self, return

plaintext = self._muc_temp_store[properties.omemo.payload] - fingerprint = self.backend.get_own_fingerprint() + fingerprint = self.backend.get_our_fingerprint() trust = OMEMOTrust.VERIFIED del self._muc_temp_store[properties.omemo.payload]

@@ -572,7 +572,7 @@ def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: if bundle is None: bundle = self.backend.get_bundle() self._nbxmpp('OMEMO').set_bundle(bundle, - self.backend.get_own_device()) + self.backend.get_our_device())

@as_task def request_bundle(self, jid: str, device_id: int): @@ -600,7 +600,7 @@ def request_bundle(self, jid: str, device_id: int): message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS))

def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: - devicelist_: set[int] = {self.backend.get_own_device()} + devicelist_: set[int] = {self.backend.get_our_device()} if devicelist is not None: devicelist_.update(devicelist) self._log.info('Publishing own devicelist: %s', devicelist_) @@ -608,7 +608,7 @@ def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None:

def clear_devicelist(self) -> None: self.backend.update_devicelist( - self._own_jid, [self.backend.get_own_device()]) + self._own_jid, [self.backend.get_our_device()]) self.set_devicelist()

@as_task @@ -661,7 +661,7 @@ def _process_devicelist_update(self, self._query_for_bundles.remove(jid)

if own_devices: - if not self.backend.is_own_device_published(): + if not self.backend.is_our_device_published(): # Our own device_id is not in the list, it could be # overwritten by some other client self.set_devicelist(devicelist)

===================================== gajim/common/storage/omemo.py ===================================== @@ -606,16 +606,16 @@ def get_identity_key_pair(self) -> IdentityKeyPair: return IdentityKeyPair.new(result.public_key, DjbECPrivateKey(result.private_key))

- def get_local_registration_id(self) -> int: + def get_our_device_id(self) -> int: query = 'SELECT device_id FROM secret LIMIT 1' result = self._con.execute(query).fetchone() assert result is not None return result.device_id

- def store_own_identity(self, - device_id: int, - identity_key_pair: IdentityKeyPair - ) -> None: + def set_our_identity(self, + device_id: int, + identity_key_pair: IdentityKeyPair + ) -> None:

query = 'SELECT * FROM secret' result = self._con.execute(query).fetchone() @@ -811,7 +811,7 @@ def get_unacknowledged_count(self,

def needs_init(self) -> bool: try: - self.get_local_registration_id() + self.get_our_device_id() except AssertionError: return True return False

===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -123,7 +123,7 @@ def _update(self) -> None:

self._omemo = client.get_module('OMEMO')

- our_fpr_formatted = self._omemo.backend.get_own_fingerprint( + our_fpr_formatted = self._omemo.backend.get_our_fingerprint( formatted=True) self._ui.our_fingerprint_1.set_text(our_fpr_formatted) self._ui.our_fingerprint_2.set_text(our_fpr_formatted) @@ -209,9 +209,11 @@ def _get_qrcode(jid: JID,

def _load_qrcode(self) -> None: client = app.get_client(self._account) + our_device_id, our_identity_key =\ + self._omemo.backend.get_our_identity() pixbuf = self._get_qrcode(client.get_own_jid(), - self._omemo.backend.get_own_device(), - self._omemo.backend.get_own_fingerprint()) + our_device_id, + our_identity_key.get_fingerprint()) self._ui.qr_code_image.set_from_pixbuf(pixbuf)

def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None:

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3a3ea83a9446c7c8edf3b0cf20dd0321b...