Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: Chatstates: Simplify and use client attribute
by Philipp Hörist (＠lovetox) 09 May '23

09 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa79e9be by Philipp Hörist at 2023-05-09T21:49:21+02:00 refactor: Chatstates: Simplify and use client attribute - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -88,8 +88,10 @@ def __init__(self, con: types.Client) -> None: self._blocked: list[JID] = [] self._enabled = False - self._con.connect_signal('state-changed', self._on_client_state_changed) - self._con.connect_signal('resume-failed', self._on_client_resume_failed) + self._client.connect_signal('state-changed', + self._on_client_state_changed) + self._client.connect_signal('resume-failed', + self._on_client_resume_failed) def _on_client_resume_failed(self, _client: types.Client, @@ -120,7 +122,7 @@ def _set_enabled(self, value: bool) -> None: 2, self._check_last_interaction) else: self.cleanup() - self._con.get_module('Contacts').force_chatstate_update() + self._client.get_module('Contacts').force_chatstate_update() @ensure_enabled def _presence_received(self, @@ -251,7 +253,7 @@ def get_active_chatstate(self, if not contact.is_groupchat: # Don’t send chatstates to ourself - if self._con.get_own_jid().bare_match(contact.jid): + if self._client.is_own_jid(contact.jid): return None if not contact.supports(Namespace.CHATSTATES): @@ -284,7 +286,7 @@ def set_chatstate_delayed(self, # User starts writing again. # Don’t send chatstates to ourself - if self._con.get_own_jid().bare_match(contact.jid): + if self._client.is_own_jid(contact.jid): return self.remove_delay_timeout(contact) @@ -294,7 +296,7 @@ def set_chatstate_delayed(self, @ensure_enabled def set_chatstate(self, contact: types.ChatContactT, state: State) -> None: # Don’t send chatstates to ourself - if self._con.get_own_jid().bare_match(contact.jid): + if self._client.is_own_jid(contact.jid): return if contact.jid in self._blocked: @@ -364,7 +366,7 @@ def _send_chatstate(self, chatstate=chatstate.value, play_sound=False) - self._con.send_message(message) + self._client.send_message(message) @ensure_enabled def set_mouse_activity(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa79e9be46bbb0bce80e2283cbd57a96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa79e9be46bbb0bce80e2283cbd57a96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Fix own JID comparison
by Philipp Hörist (＠lovetox) 09 May '23

09 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a68ce96 by Philipp Hörist at 2023-05-09T21:22:17+02:00 cfix: Fix own JID comparison - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -331,8 +331,8 @@ def _on_stanza_received(self, stanza=stanza)) def is_own_jid(self, jid: JID | str) -> bool: - jid = self.get_own_jid() - return jid.bare_match(jid) + own_jid = self.get_own_jid() + return own_jid.bare_match(jid) def get_own_jid(self) -> JID: ''' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a68ce96815cd4eea69ada57a321e65a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a68ce96815cd4eea69ada57a321e65a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Notifications: Withdraw all when a corresponding chat is read
by Philipp Hörist (＠lovetox) 09 May '23

09 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ecae706 by mjk at 2023-05-09T18:47:24+00:00 imprv: Notifications: Withdraw all when a corresponding chat is read Fixes #11030 - - - - - 3 changed files: - gajim/common/events.py - gajim/gtk/chat_list.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/events.py ===================================== @@ -122,6 +122,13 @@ class Notification(ApplicationEvent): icon_name: Optional[str] = None +@dataclass +class ChatRead(ApplicationEvent): + name: str = field(init=False, default='chat-read') + account: str + jid: JID + + @dataclass class StanzaSent(ApplicationEvent): name: str = field(init=False, default='stanza-sent') ===================================== gajim/gtk/chat_list.py ===================================== @@ -163,8 +163,9 @@ def get_open_chats(self) -> OpenChatsSettingT: def mark_as_read(self, account: str, jid: JID) -> None: chat = self._chats.get((account, jid)) - if chat is not None: + if chat is not None and chat.get_real_unread_count() > 0: chat.reset_unread() + app.ged.raise_event(events.ChatRead(account=account, jid=jid)) def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] ===================================== gajim/gtk/notification.py ===================================== @@ -83,7 +83,8 @@ def __init__(self) -> None: self.register_events([ ('notification', ged.GUI2, self._on_notification), - ('account-enabled', ged.GUI2, self._on_account_enabled) + ('account-enabled', ged.GUI2, self._on_account_enabled), + ('chat-read', ged.GUI2, self._on_chat_read) ]) for client in app.get_clients(): @@ -111,6 +112,9 @@ def _on_account_enabled(self, event: events.AccountEnabled) -> None: client = app.get_client(event.account) client.connect_signal('state-changed', self._on_client_state_changed) + def _on_chat_read(self, event: events.ChatRead) -> None: + self._withdraw(['new-message', event.account, event.jid]) + def _on_client_state_changed(self, client: Client, _signal_name: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ecae706ca7fc094398be32d28b393b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ecae706ca7fc094398be32d28b393b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Client: Add convenience method for checking own JID
by Philipp Hörist (＠lovetox) 09 May '23

09 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e1fa2e9 by Philipp Hörist at 2023-05-09T20:03:31+02:00 new: Client: Add convenience method for checking own JID - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -330,6 +330,10 @@ def _on_stanza_received(self, app.ged.raise_event(StanzaReceived(account=self._account, stanza=stanza)) + def is_own_jid(self, jid: JID | str) -> bool: + jid = self.get_own_jid() + return jid.bare_match(jid) + def get_own_jid(self) -> JID: ''' Return the last full JID we received on a bind event. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e1fa2e9055197acafa349d55359cf0a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e1fa2e9055197acafa349d55359cf0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: ChatList: Use dim color for join icon
by Daniel Brötzmann (＠wurstsalat) 07 May '23

07 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dcb304c5 by wurstsalat at 2023-05-07T21:00:57+02:00 cfix: ChatList: Use dim color for join icon - - - - - 1 changed file: - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -549,11 +549,14 @@ def _update_joined_state(self) -> None: self._ui.connection_icon.get_style_context().remove_class('spin') self._ui.connection_icon.get_style_context().remove_class( 'warning-color') + self._ui.connection_icon.get_style_context().remove_class( + 'dim-label') if self.contact.is_joining: self._ui.connection_icon.set_from_icon_name( 'feather-refresh-cw-symbolic', Gtk.IconSize.MENU) self._ui.connection_icon.get_style_context().add_class('spin') + self._ui.connection_icon.get_style_context().add_class('dim-label') self._ui.connection_icon.set_tooltip_text(_('Joining Group Chat…')) self._ui.connection_icon.show() elif (self.contact.is_not_joined or View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcb304c5a7485733959f21866219ff7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcb304c5a7485733959f21866219ff7b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Attach omemo-dr logging to verbose mode
by Philipp Hörist (＠lovetox) 07 May '23

07 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5aa9741e by Philipp Hörist at 2023-05-07T17:21:14+02:00 new: Attach omemo-dr logging to verbose mode - - - - - 2 changed files: - gajim/common/logging_helpers.py - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/logging_helpers.py ===================================== @@ -176,6 +176,11 @@ def init() -> None: root_log.addHandler(consoleloghandler) root_log.propagate = False + root_log = logging.getLogger('omemo_dr') + root_log.setLevel(logging.WARNING) + root_log.addHandler(consoleloghandler) + root_log.propagate = False + # GAJIM_DEBUG is set only on Windows when using Gajim-Debug.exe # Gajim-Debug.exe shows a command line prompt and we want to redirect # log output to it @@ -190,11 +195,13 @@ def set_loglevels(loglevels_string: str) -> None: def set_verbose() -> None: parseAndSetLogLevels('gajim=DEBUG') parseAndSetLogLevels('.nbxmpp=INFO') + parseAndSetLogLevels('.omemo_dr=DEBUG') def set_quiet() -> None: parseAndSetLogLevels('gajim=CRITICAL') parseAndSetLogLevels('.nbxmpp=CRITICAL') + parseAndSetLogLevels('.omemo_dr=CRITICAL') def _redirect_output() -> None: ===================================== gajim/common/modules/omemo.py ===================================== @@ -139,7 +139,7 @@ def __init__(self, client: types.Client) -> None: unacknowledged_count=2000) self._backend = OMEMOSessionManager( - self._own_jid, storage, omemo_config) + self._own_jid, storage, omemo_config, self._account) self._backend.register_signal('republish-bundle', self._on_republish_bundle) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5aa9741ea04b53e1104c694a9ec511bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5aa9741ea04b53e1104c694a9ec511bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: refactor: OMEMO: Change session import
by Philipp Hörist (＠lovetox) 07 May '23

07 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4959e4db by Philipp Hörist at 2023-05-07T10:45:14+02:00 refactor: OMEMO: Change session import - - - - - 4489fffa by Philipp Hörist at 2023-05-07T10:45:48+02:00 refactor: OMEMO: Simplify deleting a session - - - - - 11e14286 by Philipp Hörist at 2023-05-07T10:48:45+02:00 refactor: OMEMO: Remove legacy code Code stems from a time where MAM archives did not communicate the real jid. - - - - - 3060641c by Philipp Hörist at 2023-05-07T10:54:43+02:00 refactor: OMEMO: Access set_trust() via SessionManager - - - - - 9719d42d by Philipp Hörist at 2023-05-07T11:12:38+02:00 refactor: OMEMO: Remove obsolete code - - - - - e55dcd4b by Philipp Hörist at 2023-05-07T12:35:28+02:00 refactor: OMEMO: Use get_identity_infos() in more places - - - - - 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 ===================================== @@ -50,7 +50,7 @@ from omemo_dr.exceptions import KeyExchangeMessage from omemo_dr.exceptions import MessageNotForDevice from omemo_dr.exceptions import SelfMessage -from omemo_dr.session import OMEMOSession +from omemo_dr.session_manager import OMEMOSessionManager from omemo_dr.structs import OMEMOBundle from omemo_dr.structs import OMEMOConfig @@ -138,7 +138,8 @@ def __init__(self, client: types.Client) -> None: spk_cycle_seconds=86400, unacknowledged_count=2000) - self._backend = OMEMOSession(self._own_jid, storage, omemo_config) + self._backend = OMEMOSessionManager( + self._own_jid, storage, omemo_config) self._backend.register_signal('republish-bundle', self._on_republish_bundle) @@ -179,7 +180,7 @@ def _on_room_joined(self, self.get_affiliation_list(jid) def _on_republish_bundle(self, - _session: OMEMOSession, + _session: OMEMOSessionManager, _signal_name: str, bundle: OMEMOBundle ) -> None: @@ -187,7 +188,7 @@ def _on_republish_bundle(self, self.set_bundle(bundle=bundle) @property - def backend(self) -> OMEMOSession: + def backend(self) -> OMEMOSessionManager: return self._backend def check_send_preconditions(self, contact: types.ChatContactT) -> bool: @@ -222,17 +223,15 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: message=EncryptionInfoMsg.QUERY_DEVICES)) return False - # check if bundles are missing for some devices - if self.backend.storage.has_undecided_fingerprints(jid): - self._log.info('%s => Undecided Fingerprints for %s', - contact.account, jid) - app.ged.raise_event(EncryptionInfo( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) - return False - - if self._new_fingerprints_available(contact): + if self.backend.get_identity_infos(jid, + only_active=True, + trust=OMEMOTrust.UNDECIDED): + self._log.info('%s => Undecided Fingerprints for %s', + contact.account, jid) + app.ged.raise_event(EncryptionInfo( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) return False self._log.debug('%s => Sending Message to %s', @@ -240,30 +239,6 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: return True - def _new_fingerprints_available(self, contact: types.ChatContactT) -> bool: - fingerprints: list[int] = [] - if contact.is_groupchat: - for member_jid in self.backend.get_group_members(str(contact.jid), - without_self=False): - fingerprints = self.backend.storage.get_new_fingerprints( - member_jid) - if fingerprints: - break - - else: - fingerprints = self.backend.storage.get_new_fingerprints( - str(contact.jid)) - - if not fingerprints: - return False - - app.ged.raise_event(EncryptionInfo( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) - - return True - def is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats @@ -417,15 +392,9 @@ def _process_muc_message(self, if contact.real_jid is not None: return contact.real_jid.bare - assert isinstance(properties.omemo, OMEMOMessage) - self._log.info('Groupchat: Last resort trying to find SID in DB') - from_jid = self.backend.storage.get_jid_from_device( - properties.omemo.sid) - if not from_jid: - self._log.error( - "Can't decrypt GroupChat Message from %s", resource) - return None - return from_jid + self._log.error( + 'Unable to find JID for group chat message from %s', resource) + return None def _process_mam_message(self, properties: MessageProperties @@ -564,8 +533,12 @@ def are_keys_missing(self, contact_jid: str) -> bool: for device_id in devices_without_session: self.request_bundle(contact_jid, device_id) - if self.backend.has_trusted_keys(contact_jid): + if self.backend.get_identity_infos( + contact_jid, + only_active=True, + trust=[OMEMOTrust.VERIFIED, OMEMOTrust.BLIND]): return False + return True def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: ===================================== gajim/common/storage/omemo.py ===================================== @@ -712,17 +712,6 @@ def get_muc_fingerprints(self, jids: list[str]): return self._con.execute(query, jids).fetchall() - def has_undecided_fingerprints(self, jid: str) -> bool: - query = '''SELECT public_key as "public_key [pk]" FROM identities - WHERE recipient_id = ? AND trust = ?''' - result = self._con.execute(query, - (jid, OMEMOTrust.UNDECIDED)).fetchall() - undecided = [row.public_key for row in result] - - inactive = self.get_inactive_sessions_keys(jid) - undecided = set(undecided) - set(inactive) - return bool(undecided) - def get_default_trust(self, jid: str) -> OMEMOTrust: if not self._is_blind_trust_enabled(): return OMEMOTrust.UNDECIDED @@ -734,25 +723,6 @@ def get_default_trust(self, jid: str) -> OMEMOTrust: return OMEMOTrust.BLIND return OMEMOTrust.UNDECIDED - def get_trusted_fingerprints(self, address: str) -> list[IdentityKey]: - query = '''SELECT public_key as "public_key [pk]" FROM identities - WHERE recipient_id = ? AND trust IN(1, 3)''' - result = self._con.execute(query, (address,)).fetchall() - return [row.public_key for row in result] - - def get_new_fingerprints(self, jid: str) -> list[int]: - query = '''SELECT _id FROM identities WHERE shown = 0 - AND recipient_id = ?''' - - result = self._con.execute(query, (jid,)).fetchall() - return [row.id for row in result] - - def set_shown_fingerprints(self, fingerprints: list[int]) -> None: - query = 'UPDATE identities SET shown = 1 WHERE _id IN ({})'.format( - ', '.join(['?'] * len(fingerprints))) - self._con.execute(query, fingerprints) - self._con.commit() - def set_trust(self, recipient_id: str, identity_key: IdentityKey, ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -306,13 +306,10 @@ def _on_destroy(self, *args: Any) -> None: def delete_fingerprint(self, *args: Any) -> None: def _remove(): - device_id = self._identity_info.device_id - - self._omemo.backend.remove_device(self._address, device_id) - self._omemo.backend.storage.delete_session(self._address, - device_id) - self._omemo.backend.storage.delete_identity( - self._address, self._identity_info.public_key) + self._omemo.backend.delete_session( + self._address, + self._identity_info.device_id, + delete_identity=True) listbox = cast(Gtk.ListBox, self.get_parent()) listbox.remove(self) @@ -336,7 +333,7 @@ def set_trust(self, trust: OMEMOTrust) -> None: image.get_style_context().add_class(css_class) image.set_tooltip_text(tooltip) - self._omemo.backend.storage.set_trust( + self._omemo.backend.set_trust( self._address, self._identity_info.public_key, trust) @property View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed69746343500c8e31cdd8caece53c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed69746343500c8e31cdd8caece53c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Enable spell checker by default
by Philipp Hörist (＠lovetox) 07 May '23

07 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed697463 by Philipp Hörist at 2023-05-07T09:52:49+02:00 change: Enable spell checker by default - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -275,7 +275,7 @@ class _ACCOUNTDEFAULT: 'use_keyring': True, 'use_kib_mib': False, 'use_libappindicator': True, - 'use_speller': False, + 'use_speller': True, 'use_stun_server': False, 'use_urgency_hint': True, 'video_framerate': '', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed69746343500c8e31cdd8caece53c79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed69746343500c8e31cdd8caece53c79… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: XMLConsole: Select first account by default
by Daniel Brötzmann (＠wurstsalat) 06 May '23

06 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3c2c05f8 by wurstsalat at 2023-05-07T00:44:34+02:00 fix: XMLConsole: Select first account by default Fixes #11498 - - - - - 3 changed files: - gajim/data/gui/xml_console.ui - gajim/gtk/builder.pyi - gajim/gtk/xml_console.py Changes: ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk+" version="3.24"/> <requires lib="gtksourceview" version="4.0"/> <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> @@ -251,10 +251,42 @@ </packing> </child> <child> - <object class="GtkActionBar" id="actionbar"> - <property name="name">actionbar</property> + <object class="GtkBox" id="actionbox"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="send"> + <property name="label" translatable="yes">_Send</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_send" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes">Account</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkButton"> <property name="visible">True</property> @@ -271,7 +303,9 @@ </child> </object> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> @@ -290,7 +324,9 @@ </child> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -308,7 +344,9 @@ </child> </object> <packing> - <property name="position">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> <child> @@ -327,7 +365,9 @@ </child> </object> <packing> - <property name="position">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> <child> @@ -342,34 +382,18 @@ </child> </object> <packing> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="send"> - <property name="label" translatable="yes">_Send</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send" swapped="no"/> - </object> - <packing> - <property name="pack-type">end</property> - <property name="position">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> + <style> + <class name="padding-6"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> ===================================== gajim/gtk/builder.pyi ===================================== @@ -963,10 +963,11 @@ class XmlConsoleBuilder(Builder): sourceview: GtkSource.View scrolled_input: Gtk.ScrolledWindow input_entry: GtkSource.View - actionbar: Gtk.ActionBar + actionbox: Gtk.Box + send: Gtk.Button + account_label: Gtk.Label paste: Gtk.Button menubutton: Gtk.MenuButton - send: Gtk.Button @overload ===================================== gajim/gtk/xml_console.py ===================================== @@ -84,9 +84,13 @@ def __init__(self) -> None: self._combo.set_no_show_all(True) self._combo.set_visible(False) self._combo.connect('changed', self._on_value_change) - for account, label in self._get_accounts(): + available_accounts = self._get_accounts() + for account, label in available_accounts: self._combo.append(account, label) - self._ui.actionbar.pack_end(self._combo) + if available_accounts: + self._combo.set_active(0) + self._ui.actionbox.pack_end(self._combo, False, False, 0) + self._ui.actionbox.reorder_child(self._combo, 1) self._create_tags() @@ -270,6 +274,7 @@ def _on_input(self, button: Gtk.ToggleButton) -> None: child2.show() self._ui.send.show() self._ui.paste.show() + self._ui.account_label.show() self._combo.show() self._ui.menubutton.show() self._ui.input_entry.grab_focus() @@ -277,6 +282,7 @@ def _on_input(self, button: Gtk.ToggleButton) -> None: child2.hide() self._ui.send.hide() self._ui.paste.hide() + self._ui.account_label.hide() self._combo.hide() self._ui.menubutton.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c2c05f81d3ae586f146a21e37b65797… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c2c05f81d3ae586f146a21e37b65797… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: OMEMO: Adapt to omemo-dr changes
by Philipp Hörist (＠lovetox) 06 May '23

06 May '23

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/3a3ea83a9446c7c8edf3b0cf20dd0321… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3a3ea83a9446c7c8edf3b0cf20dd0321… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits