Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] imprv: ChatList: Improve sorting
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e205b303 by Philipp Hörist at 2023-05-14T11:38:57+00:00 imprv: ChatList: Improve sorting The sort of the chat list is inhibited when the mouse is over the chat list. This makes sure the sorting is invalidated once the mouse exits the chat list. - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -71,7 +71,9 @@ def __init__(self, workspace_id: str) -> None: self.set_sort_func(self._sort_func) self._set_placeholder() - self._mouseover: bool = False + self._rows_need_sort = False + self._context_menu_visible = False + self._mouseover = False self._pinned_order_change = False self.connect('enter-notify-event', self._on_mouse_focus_changed) self.connect('leave-notify-event', self._on_mouse_focus_changed) @@ -206,6 +208,8 @@ def add_chat(self, row.connect('drag-begin', self._on_row_drag_begin) row.connect('unread-changed', self._on_row_unread_changed) + row.connect('context-menu-state-changed', + self._on_context_menu_state_changed) self.add(row) @@ -371,6 +375,14 @@ def _on_row_drag_begin(self, def _on_row_unread_changed(self, row: ChatListRow) -> None: self._emit_unread_changed() + def _on_context_menu_state_changed(self, + row: ChatListRow, + menu_is_visible: bool + ) -> None: + + self._context_menu_visible = menu_is_visible + self._schedule_check_sort_inhibit() + def _on_drag_data_received(self, _widget: Gtk.Widget, _drag_context: Gdk.DragContext, @@ -478,8 +490,9 @@ def _header_func(row: ChatListRow, before: ChatListRow | None) -> None: row.set_header_type(None) def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: - if self._mouseover and not self._pinned_order_change: - log.debug('Mouseover active, don’t sort rows') + if self._is_sort_inhibited(): + self._rows_need_sort = True + log.debug('Sort inhibited') return 0 # Sort pinned rows according to stored order @@ -497,6 +510,33 @@ def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: # Sort by timestamp return -1 if row1.timestamp > row2.timestamp else 1 + def invalidate_sort(self) -> None: + if self._is_sort_inhibited(): + return + + self._rows_need_sort = False + log.debug('Sort Chatlist') + Gtk.ListBox.invalidate_sort(self) + + def _is_sort_inhibited(self) -> bool: + if self._pinned_order_change: + return False + return self._mouseover or self._context_menu_visible + + def _schedule_check_sort_inhibit(self) -> None: + if self._is_sort_inhibited(): + return + GLib.timeout_add(100, self._check_sort_inhibit) + + def _check_sort_inhibit(self) -> None: + if self._is_sort_inhibited(): + return + + if not self._rows_need_sort: + return + + self.invalidate_sort() + def _on_mouse_focus_changed(self, _widget: Gtk.ListBox, event: Gdk.EventCrossing @@ -510,6 +550,8 @@ def _on_mouse_focus_changed(self, # Not hovering a Gtk.ListBoxRow (row is INFERIOR) self._mouseover = False + self._schedule_check_sort_inhibit() + @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -63,6 +63,10 @@ class ChatListRow(Gtk.ListBoxRow): GObject.SignalFlags.RUN_LAST, None, ()), + 'context-menu-state-changed': ( + GObject.SignalFlags.RUN_LAST, + None, + (bool,)), } def __init__(self, @@ -437,14 +441,14 @@ def _on_row_button_press_event(self, ) -> None: if event.button == Gdk.BUTTON_SECONDARY: - self._popup_menu(event) + self._raise_context_popover(event) elif event.button == Gdk.BUTTON_MIDDLE: app.window.activate_action( 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) - def _popup_menu(self, event: Gdk.EventButton): + def _raise_context_popover(self, event: Gdk.EventButton): menu = get_chat_list_row_menu( self.workspace_id, self.account, self.jid, self._pinned) @@ -460,8 +464,13 @@ def _popup_menu(self, event: Gdk.EventButton): popover = GajimPopover(menu, relative_to=self) popover.set_pointing_to_coord(x=x, y=event.y) + popover.connect('closed', self._on_context_popover_closed) + self.emit('context-menu-state-changed', True) popover.popup() + def _on_context_popover_closed(self, _popover: Gtk.Popover) -> None: + self.emit('context-menu-state-changed', False) + def _on_drag_begin(self, row: ChatListRow, drag_context: Gdk.DragContext View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e205b303e1f25da1a5d90072d5c61376… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e205b303e1f25da1a5d90072d5c61376… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][sort-chat-list] 5 commits: imprv: ACE: Make descriptions selectable and copyable
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch sort-chat-list at gajim / gajim Commits: 909bae91 by mjk at 2023-05-13T13:45:12+00:00 imprv: ACE: Make descriptions selectable and copyable - - - - - ff08ac13 by mjk at 2023-05-13T13:54:14+00:00 fix: ACE: Handle invalid numeric values gracefully - - - - - 63eb1041 by wurstsalat at 2023-05-13T22:33:58+02:00 imprv: Make contact details/settings available when offline - - - - - 1128a3db by Philipp Hörist at 2023-05-14T13:37:45+02:00 new: MAM: Add sync state signals - - - - - e205b303 by Philipp Hörist at 2023-05-14T11:38:57+00:00 imprv: ChatList: Improve sorting The sort of the chat list is inhibited when the mouse is over the chat list. This makes sure the sorting is invalidated once the mouse exits the chat list. - - - - - 9 changed files: - gajim/common/modules/mam.py - gajim/data/gui/advanced_configuration.ui - gajim/data/gui/groupchat_details.ui - gajim/gtk/advanced_config.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -464,12 +464,16 @@ def request_archive_on_muc_join(self, jid: JID): if threshold == SyncThreshold.NO_SYNC: return + contact = self._get_contact(jid, groupchat=True) + contact.notify('mam-sync-started') + mam_id, start_date = self._get_muc_query_params(jid, threshold) result = yield self._execute_query(jid, mam_id, start_date) if is_error(result): if result.condition != 'item-not-found': self._log.warning(result) + contact.notify('mam-sync-error', result.get_text()) return app.storage.archive.reset_archive_infos(result.jid) @@ -477,6 +481,7 @@ def request_archive_on_muc_join(self, jid: JID): result = yield self._execute_query(result.jid, None, start_date) if is_error(result): self._log.warning(result) + contact.notify('mam-sync-error', result.get_text()) return if result.rsm.last is not None: @@ -488,6 +493,8 @@ def request_archive_on_muc_join(self, jid: JID): last_mam_id=result.rsm.last, last_muc_timestamp=time.time()) + contact.notify('mam-sync-finished') + @as_task def _execute_query(self, jid: JID, ===================================== gajim/data/gui/advanced_configuration.ui ===================================== @@ -96,7 +96,7 @@ <object class="GtkLabel" id="description"> <property name="height_request">40</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="selectable">True</property> <property name="wrap">True</property> <property name="max_width_chars">60</property> <property name="xalign">0</property> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -55,9 +55,10 @@ <child> <object class="GtkToggleButton" id="edit_name_button"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Name…</property> + <property name="tooltip-text" translatable="yes">Not connected</property> <property name="valign">center</property> <signal name="toggled" handler="_on_edit_name_toggled" swapped="no"/> <child> ===================================== gajim/gtk/advanced_config.py ===================================== @@ -201,7 +201,10 @@ def _on_config_edited(self, value = text if modelrow[Column.TYPE] == SETTING_TYPES[int]: - value = int(text) + try: + value = int(text) + except ValueError: + return app.settings.set(setting, value) modelrow[Column.VALUE] = text ===================================== gajim/gtk/chat_list.py ===================================== @@ -71,7 +71,9 @@ def __init__(self, workspace_id: str) -> None: self.set_sort_func(self._sort_func) self._set_placeholder() - self._mouseover: bool = False + self._rows_need_sort = False + self._context_menu_visible = False + self._mouseover = False self._pinned_order_change = False self.connect('enter-notify-event', self._on_mouse_focus_changed) self.connect('leave-notify-event', self._on_mouse_focus_changed) @@ -206,6 +208,8 @@ def add_chat(self, row.connect('drag-begin', self._on_row_drag_begin) row.connect('unread-changed', self._on_row_unread_changed) + row.connect('context-menu-state-changed', + self._on_context_menu_state_changed) self.add(row) @@ -371,6 +375,14 @@ def _on_row_drag_begin(self, def _on_row_unread_changed(self, row: ChatListRow) -> None: self._emit_unread_changed() + def _on_context_menu_state_changed(self, + row: ChatListRow, + menu_is_visible: bool + ) -> None: + + self._context_menu_visible = menu_is_visible + self._schedule_check_sort_inhibit() + def _on_drag_data_received(self, _widget: Gtk.Widget, _drag_context: Gdk.DragContext, @@ -478,8 +490,9 @@ def _header_func(row: ChatListRow, before: ChatListRow | None) -> None: row.set_header_type(None) def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: - if self._mouseover and not self._pinned_order_change: - log.debug('Mouseover active, don’t sort rows') + if self._is_sort_inhibited(): + self._rows_need_sort = True + log.debug('Sort inhibited') return 0 # Sort pinned rows according to stored order @@ -497,6 +510,33 @@ def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: # Sort by timestamp return -1 if row1.timestamp > row2.timestamp else 1 + def invalidate_sort(self) -> None: + if self._is_sort_inhibited(): + return + + self._rows_need_sort = False + log.debug('Sort Chatlist') + Gtk.ListBox.invalidate_sort(self) + + def _is_sort_inhibited(self) -> bool: + if self._pinned_order_change: + return False + return self._mouseover or self._context_menu_visible + + def _schedule_check_sort_inhibit(self) -> None: + if self._is_sort_inhibited(): + return + GLib.timeout_add(100, self._check_sort_inhibit) + + def _check_sort_inhibit(self) -> None: + if self._is_sort_inhibited(): + return + + if not self._rows_need_sort: + return + + self.invalidate_sort() + def _on_mouse_focus_changed(self, _widget: Gtk.ListBox, event: Gdk.EventCrossing @@ -510,6 +550,8 @@ def _on_mouse_focus_changed(self, # Not hovering a Gtk.ListBoxRow (row is INFERIOR) self._mouseover = False + self._schedule_check_sort_inhibit() + @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -63,6 +63,10 @@ class ChatListRow(Gtk.ListBoxRow): GObject.SignalFlags.RUN_LAST, None, ()), + 'context-menu-state-changed': ( + GObject.SignalFlags.RUN_LAST, + None, + (bool,)), } def __init__(self, @@ -437,14 +441,14 @@ def _on_row_button_press_event(self, ) -> None: if event.button == Gdk.BUTTON_SECONDARY: - self._popup_menu(event) + self._raise_context_popover(event) elif event.button == Gdk.BUTTON_MIDDLE: app.window.activate_action( 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) - def _popup_menu(self, event: Gdk.EventButton): + def _raise_context_popover(self, event: Gdk.EventButton): menu = get_chat_list_row_menu( self.workspace_id, self.account, self.jid, self._pinned) @@ -460,8 +464,13 @@ def _popup_menu(self, event: Gdk.EventButton): popover = GajimPopover(menu, relative_to=self) popover.set_pointing_to_coord(x=x, y=event.y) + popover.connect('closed', self._on_context_popover_closed) + self.emit('context-menu-state-changed', True) popover.popup() + def _on_context_popover_closed(self, _popover: Gtk.Popover) -> None: + self.emit('context-menu-state-changed', False) + def _on_drag_begin(self, row: ChatListRow, drag_context: Gdk.DragContext ===================================== gajim/gtk/chat_stack.py ===================================== @@ -507,7 +507,6 @@ def _update_base_actions(self, contact: ChatContactT) -> None: jingle.get_enabled() or httpupload.get_enabled()) - app.window.get_action('show-contact-info').set_enabled(online) app.window.get_action('correct-message').set_enabled(online) def _update_chat_actions(self, contact: BareContact) -> None: ===================================== gajim/gtk/const.py ===================================== @@ -232,7 +232,7 @@ def __str__(self): ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), - ('show-contact-info', None, False), + ('show-contact-info', None, True), ('send-message', None, False), ('muc-change-nickname', None, False), ('muc-invite', None, False), ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -22,7 +22,9 @@ from gajim.common import app from gajim.common import ged +from gajim.common import types from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -55,6 +57,9 @@ def __init__(self, self.account = contact.account self._client = app.get_client(contact.account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) + self._contact = contact self._contact.connect('avatar-update', self._on_avatar_update) @@ -62,7 +67,7 @@ def __init__(self, self._ui.connect_signals(self) self._switcher = SideBarSwitcher(width=250) - self._switcher.set_stack(self._ui.main_stack) + self._switcher.set_stack(self._ui.main_stack, rows_visible=False) self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify::visible-child-name', self._on_stack_child_changed) @@ -73,10 +78,14 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() self._add_groupchat_encryption() - self._add_groupchat_manage() - self._add_affiliations() - self._add_outcasts() - self._add_configuration() + + if self._client.state.is_available: + self._ui.edit_name_button.set_sensitive(True) + self._ui.edit_name_button.set_tooltip_text(_('Edit Name…')) + self._add_groupchat_manage() + self._add_affiliations() + self._add_outcasts() + self._add_configuration() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -92,6 +101,16 @@ def __init__(self, self.show_all() + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: SimpleClientState + ) -> None: + + self._ui.edit_name_button.set_sensitive(state.is_connected) + self._ui.edit_name_button.set_tooltip_text( + _('Not connected') if not state.is_connected else _('Edit Name…')) + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return @@ -138,6 +157,7 @@ def _add_groupchat_manage(self) -> None: self._groupchat_manage = GroupchatManage(self.account, self._contact) self._ui.manage_box.add(self._groupchat_manage) + self._switcher.set_row_visible('manage', True) def _add_groupchat_info(self) -> None: self._groupchat_info = GroupChatInfoScrolled( @@ -148,6 +168,7 @@ def _add_groupchat_info(self) -> None: self._groupchat_info.set_from_disco_info(disco_info) self._groupchat_info.set_subject(self._contact.subject) self._ui.info_box.add(self._groupchat_info) + self._switcher.set_row_visible('information', True) def _add_groupchat_settings(self) -> None: main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24) @@ -174,6 +195,7 @@ def _add_groupchat_settings(self) -> None: scrolled_window.add(main_box) self._ui.settings_box.add(scrolled_window) + self._switcher.set_row_visible('settings', True) def _add_groupchat_encryption(self) -> None: if (self._contact.is_groupchat and @@ -184,18 +206,22 @@ def _add_groupchat_encryption(self) -> None: self._ui.encryption_box.add( OMEMOTrustManager(self._contact.account, self._contact)) + self._switcher.set_row_visible('encryption-omemo', True) def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) + self._switcher.set_row_visible('affiliations', True) def _add_outcasts(self) -> None: affiliations = GroupchatOutcasts(self._client, self._contact) self._ui.outcasts_box.add(affiliations) + self._switcher.set_row_visible('outcasts', True) def _add_configuration(self) -> None: config = GroupchatConfig(self._client, self._contact) self._ui.configuration_box.add(config) + self._switcher.set_row_visible('config', True) def _on_key_press(self, _widget: GroupchatDetails, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e5094ec0c349e8288675cfc7ea0c969… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e5094ec0c349e8288675cfc7ea0c969… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: MAM: Add sync state signals
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1128a3db by Philipp Hörist at 2023-05-14T13:37:45+02:00 new: MAM: Add sync state signals - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -464,12 +464,16 @@ def request_archive_on_muc_join(self, jid: JID): if threshold == SyncThreshold.NO_SYNC: return + contact = self._get_contact(jid, groupchat=True) + contact.notify('mam-sync-started') + mam_id, start_date = self._get_muc_query_params(jid, threshold) result = yield self._execute_query(jid, mam_id, start_date) if is_error(result): if result.condition != 'item-not-found': self._log.warning(result) + contact.notify('mam-sync-error', result.get_text()) return app.storage.archive.reset_archive_infos(result.jid) @@ -477,6 +481,7 @@ def request_archive_on_muc_join(self, jid: JID): result = yield self._execute_query(result.jid, None, start_date) if is_error(result): self._log.warning(result) + contact.notify('mam-sync-error', result.get_text()) return if result.rsm.last is not None: @@ -488,6 +493,8 @@ def request_archive_on_muc_join(self, jid: JID): last_mam_id=result.rsm.last, last_muc_timestamp=time.time()) + contact.notify('mam-sync-finished') + @as_task def _execute_query(self, jid: JID, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1128a3db45accf8f210dd907d0fba704… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1128a3db45accf8f210dd907d0fba704… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Make contact details/settings available when offline
by Daniel Brötzmann (＠wurstsalat) 13 May '23

13 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 63eb1041 by wurstsalat at 2023-05-13T22:33:58+02:00 imprv: Make contact details/settings available when offline - - - - - 4 changed files: - gajim/data/gui/groupchat_details.ui - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -55,9 +55,10 @@ <child> <object class="GtkToggleButton" id="edit_name_button"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Name…</property> + <property name="tooltip-text" translatable="yes">Not connected</property> <property name="valign">center</property> <signal name="toggled" handler="_on_edit_name_toggled" swapped="no"/> <child> ===================================== gajim/gtk/chat_stack.py ===================================== @@ -507,7 +507,6 @@ def _update_base_actions(self, contact: ChatContactT) -> None: jingle.get_enabled() or httpupload.get_enabled()) - app.window.get_action('show-contact-info').set_enabled(online) app.window.get_action('correct-message').set_enabled(online) def _update_chat_actions(self, contact: BareContact) -> None: ===================================== gajim/gtk/const.py ===================================== @@ -232,7 +232,7 @@ def __str__(self): ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), - ('show-contact-info', None, False), + ('show-contact-info', None, True), ('send-message', None, False), ('muc-change-nickname', None, False), ('muc-invite', None, False), ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -22,7 +22,9 @@ from gajim.common import app from gajim.common import ged +from gajim.common import types from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -55,6 +57,9 @@ def __init__(self, self.account = contact.account self._client = app.get_client(contact.account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) + self._contact = contact self._contact.connect('avatar-update', self._on_avatar_update) @@ -62,7 +67,7 @@ def __init__(self, self._ui.connect_signals(self) self._switcher = SideBarSwitcher(width=250) - self._switcher.set_stack(self._ui.main_stack) + self._switcher.set_stack(self._ui.main_stack, rows_visible=False) self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify::visible-child-name', self._on_stack_child_changed) @@ -73,10 +78,14 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() self._add_groupchat_encryption() - self._add_groupchat_manage() - self._add_affiliations() - self._add_outcasts() - self._add_configuration() + + if self._client.state.is_available: + self._ui.edit_name_button.set_sensitive(True) + self._ui.edit_name_button.set_tooltip_text(_('Edit Name…')) + self._add_groupchat_manage() + self._add_affiliations() + self._add_outcasts() + self._add_configuration() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -92,6 +101,16 @@ def __init__(self, self.show_all() + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: SimpleClientState + ) -> None: + + self._ui.edit_name_button.set_sensitive(state.is_connected) + self._ui.edit_name_button.set_tooltip_text( + _('Not connected') if not state.is_connected else _('Edit Name…')) + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return @@ -138,6 +157,7 @@ def _add_groupchat_manage(self) -> None: self._groupchat_manage = GroupchatManage(self.account, self._contact) self._ui.manage_box.add(self._groupchat_manage) + self._switcher.set_row_visible('manage', True) def _add_groupchat_info(self) -> None: self._groupchat_info = GroupChatInfoScrolled( @@ -148,6 +168,7 @@ def _add_groupchat_info(self) -> None: self._groupchat_info.set_from_disco_info(disco_info) self._groupchat_info.set_subject(self._contact.subject) self._ui.info_box.add(self._groupchat_info) + self._switcher.set_row_visible('information', True) def _add_groupchat_settings(self) -> None: main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24) @@ -174,6 +195,7 @@ def _add_groupchat_settings(self) -> None: scrolled_window.add(main_box) self._ui.settings_box.add(scrolled_window) + self._switcher.set_row_visible('settings', True) def _add_groupchat_encryption(self) -> None: if (self._contact.is_groupchat and @@ -184,18 +206,22 @@ def _add_groupchat_encryption(self) -> None: self._ui.encryption_box.add( OMEMOTrustManager(self._contact.account, self._contact)) + self._switcher.set_row_visible('encryption-omemo', True) def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) + self._switcher.set_row_visible('affiliations', True) def _add_outcasts(self) -> None: affiliations = GroupchatOutcasts(self._client, self._contact) self._ui.outcasts_box.add(affiliations) + self._switcher.set_row_visible('outcasts', True) def _add_configuration(self) -> None: config = GroupchatConfig(self._client, self._contact) self._ui.configuration_box.add(config) + self._switcher.set_row_visible('config', True) def _on_key_press(self, _widget: GroupchatDetails, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63eb1041e1ff65fd3b7fa69ab95f1bb7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63eb1041e1ff65fd3b7fa69ab95f1bb7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: ACE: Make descriptions selectable and copyable
by Philipp Hörist (＠lovetox) 13 May '23

13 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 909bae91 by mjk at 2023-05-13T13:45:12+00:00 imprv: ACE: Make descriptions selectable and copyable - - - - - ff08ac13 by mjk at 2023-05-13T13:54:14+00:00 fix: ACE: Handle invalid numeric values gracefully - - - - - 2 changed files: - gajim/data/gui/advanced_configuration.ui - gajim/gtk/advanced_config.py Changes: ===================================== gajim/data/gui/advanced_configuration.ui ===================================== @@ -96,7 +96,7 @@ <object class="GtkLabel" id="description"> <property name="height_request">40</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="selectable">True</property> <property name="wrap">True</property> <property name="max_width_chars">60</property> <property name="xalign">0</property> ===================================== gajim/gtk/advanced_config.py ===================================== @@ -201,7 +201,10 @@ def _on_config_edited(self, value = text if modelrow[Column.TYPE] == SETTING_TYPES[int]: - value = int(text) + try: + value = int(text) + except ValueError: + return app.settings.set(setting, value) modelrow[Column.VALUE] = text View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8694404e5b15cdb3b897673a278967b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8694404e5b15cdb3b897673a278967b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch sort-chat-list
by Philipp Hörist (＠lovetox) 12 May '23

12 May '23

Philipp Hörist pushed new branch sort-chat-list at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/sort-chat-list You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Remove "escape_key_closes" from ACE
by Philipp Hörist (＠lovetox) 11 May '23

11 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8694404e by Philipp Hörist at 2023-05-11T23:11:24+02:00 change: Remove "escape_key_closes" from ACE This setting is now available under Preferences -> Chat - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -671,7 +671,6 @@ class WorkspaceSettings(TypedDict): 'account in the Accounts window. BE CAREFUL, when you are logged ' 'in with a negative priority, you will NOT receive any message ' 'from your server.'), - 'escape_key_closes': _('Close a chat by pressing the Escape key'), 'file_transfers_port': '', 'ft_add_hosts_to_send': _( 'List of send hosts (comma separated) in ' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8694404e5b15cdb3b897673a278967b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8694404e5b15cdb3b897673a278967b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: OMEMO: Adpat to changed API
by Philipp Hörist (＠lovetox) 10 May '23

10 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: c321a691 by Philipp Hörist at 2023-05-10T23:40:00+02:00 refactor: OMEMO: Adpat to changed API - - - - - 1 changed file: - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -547,7 +547,7 @@ def are_keys_missing(self, contact_jid: str) -> bool: def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: if bundle is None: - bundle = self.backend.get_bundle() + bundle = self.backend.get_bundle(Namespace.OMEMO_TEMP) self._nbxmpp('OMEMO').set_bundle(bundle, self.backend.get_our_device()) @@ -564,7 +564,7 @@ def request_bundle(self, jid: str, device_id: int): jid, device_id, bundle) return - self.backend.build_session(jid, device_id, bundle) + self.backend.build_session(jid, bundle) self._log.info('Session created for: %s', jid) # TODO: In MUC we should send a groupchat message self._send_key_transport_message('chat', jid, [device_id]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c321a6915ed670457be4f848b630bba3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c321a6915ed670457be4f848b630bba3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] change: OMEMO: Add device id and namespace to OMEMOBundle
by Philipp Hörist (＠lovetox) 10 May '23

10 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 09cffc03 by Philipp Hörist at 2023-05-10T20:12:53+02:00 change: OMEMO: Add device id and namespace to OMEMOBundle - - - - - 2 changed files: - nbxmpp/modules/omemo.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -161,7 +161,7 @@ class OMEMO(BaseModule): if not items: yield task.set_result(None) - yield _parse_bundle(items[0]) + yield _parse_bundle(items[0], device_id) def _parse_omemo_message(stanza): @@ -235,7 +235,7 @@ def _parse_omemo_message(stanza): return OMEMOMessage(sid=sid, iv=iv, keys=keys, payload=payload) -def _parse_bundle(item): +def _parse_bundle(item, device_id): ''' <item id='current'> <bundle xmlns='eu.siacs.conversations.axolotl'> @@ -317,7 +317,9 @@ def _parse_bundle(item): result['otpks'].append({'key': key, 'id': id_}) - return OMEMOBundle(**result) + return OMEMOBundle(**result, + device_id=device_id, + namespace=Namespace.OMEMO_TEMP) def _make_bundle(bundle): ===================================== nbxmpp/structs.py ===================================== @@ -732,6 +732,8 @@ class OMEMOBundle(NamedTuple): spk_signature: bytes ik: bytes otpks: list[dict[str, str]] + device_id: int = -1 + namespace: str = Namespace.OMEMO_TEMP def pick_prekey(self) -> dict[str, str]: return random.SystemRandom().choice(self.otpks) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/09cffc03dc54c95766a0ad20… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/09cffc03dc54c95766a0ad20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: feat: JID sharing: Include verified OMEMO fingerprints
by Philipp Hörist (＠lovetox) 10 May '23

10 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb0257bf by mjk at 2023-05-10T09:38:21+00:00 feat: JID sharing: Include verified OMEMO fingerprints - - - - - ef9479b9 by mjk at 2023-05-10T09:49:45+00:00 perf: QR codes: Avoid roundtrip to PNG in storage and back - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/modules/omemo.py - gajim/gtk/chat_banner.py - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -48,7 +48,6 @@ import socket import string import sys -import tempfile import unicodedata import weakref import webbrowser @@ -83,6 +82,7 @@ from nbxmpp.structs import ProxyData from packaging.requirements import Requirement from packaging.version import Version as V +from qrcode.image.pil import PilImage as QrcPilImage from gajim.common import app from gajim.common import configpaths @@ -370,9 +370,6 @@ def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: def generate_qr_code(content: str) -> GdkPixbuf.Pixbuf | None: - image_path = os.path.join( - tempfile.gettempdir(), - f'{get_random_string()}.png') qr = qrcode.QRCode(version=None, error_correction=qrcode.constants.ERROR_CORRECT_L, box_size=6, @@ -380,9 +377,11 @@ def generate_qr_code(content: str) -> GdkPixbuf.Pixbuf | None: qr.add_data(content) qr.make(fit=True) - img = qr.make_image(fill_color='black', back_color='white') - img.save(image_path) - return GdkPixbuf.Pixbuf.new_from_file(image_path) + img = qr.make_image(image_factory=QrcPilImage).convert('RGB') + return GdkPixbuf.Pixbuf.new_from_bytes( + GLib.Bytes.new(img.tobytes()), + GdkPixbuf.Colorspace.RGB, False, 8, + img.width, img.height, img.width*3) def play_sound(sound_event: str, ===================================== gajim/common/modules/omemo.py ===================================== @@ -50,6 +50,7 @@ from omemo_dr.exceptions import KeyExchangeMessage from omemo_dr.exceptions import MessageNotForDevice from omemo_dr.exceptions import SelfMessage +from omemo_dr.identitykey import IdentityKey from omemo_dr.session_manager import OMEMOSessionManager from omemo_dr.structs import OMEMOBundle from omemo_dr.structs import OMEMOConfig @@ -61,6 +62,7 @@ from gajim.common.const import EncryptionData from gajim.common.const import EncryptionInfoMsg from gajim.common.const import Trust as GajimTrust +from gajim.common.const import XmppUriQuery from gajim.common.events import EncryptionInfo from gajim.common.events import MucAdded from gajim.common.events import MucDiscoUpdate @@ -92,6 +94,8 @@ ('origin-id', Namespace.SID), ] +DeviceIdT = int +IdentityT = tuple[DeviceIdT, IdentityKey] class OMEMO(BaseModule): @@ -646,6 +650,25 @@ def _debug_print_stanza(self, stanza: Any) -> None: stanzastr = stanzastr[0:-1] self._log.debug(stanzastr) + def compose_trust_uri(self, jid: JID) -> str: + verified_identities = [ + (info.device_id, info.public_key) + for info in self._backend.get_identity_infos( + jid.bare, only_active=True, trust=OMEMOTrust.VERIFIED) + ] + if self._client.is_own_jid(jid): + verified_identities.insert(0, self._backend.get_our_identity()) + return compose_trust_uri(jid, verified_identities) + def cleanup(self) -> None: self._backend.destroy() del self._backend + + +def compose_trust_uri(jid: JID, devices: list[IdentityT]) -> str: + query = ( + XmppUriQuery.MESSAGE.value, + [(f'omemo-sid-{sid}', ik.get_fingerprint()) for sid, ik in devices] + ) if devices else None + uri = jid.new_as_bare().to_iri(query) + return uri ===================================== gajim/gtk/chat_banner.py ===================================== @@ -334,13 +334,13 @@ def _update_share_box(self) -> None: self._ui.jid_label.set_text(str(self._contact.jid)) def _get_share_uri(self) -> str: + assert self._client is not None assert self._contact is not None jid = self._contact.get_address() if self._contact.is_groupchat: return jid.to_iri(XmppUriQuery.JOIN.value) else: - # TODO: add verified OMEMO FPs - return jid.to_iri() + return self._client.get_module('OMEMO').compose_trust_uri(jid) def _on_share_clicked(self, _button: Gtk.Button) -> None: # Generate QR code on demand (i.e. not when switching chats) ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -25,22 +25,20 @@ import logging import time -from gi.repository import GdkPixbuf from gi.repository import Gtk -from nbxmpp.protocol import JID from omemo_dr.const import OMEMOTrust from omemo_dr.structs import IdentityInfo from gajim.common import app from gajim.common import ged from gajim.common import types -from gajim.common.const import XmppUriQuery from gajim.common.events import AccountConnected from gajim.common.events import AccountDisconnected from gajim.common.ged import EventHelper from gajim.common.helpers import generate_qr_code from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact +from gajim.common.modules.omemo import compose_trust_uri from .builder import get_builder from .dialogs import ConfirmationDialog @@ -196,25 +194,12 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: str(contact.jid)): self._ui.list.add(KeyRow(contact, identity_info)) - @staticmethod - def _get_qrcode(jid: JID, - sid: int, - fingerprint: str - ) -> GdkPixbuf.Pixbuf | None: - - qry = (XmppUriQuery.MESSAGE.value, [(f'omemo-sid-{sid}', fingerprint)]) - ver_string = jid.new_as_bare().to_iri(qry) - log.debug('Verification String: %s', ver_string) - return generate_qr_code(ver_string) - 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(), - our_device_id, - our_identity_key.get_fingerprint()) - self._ui.qr_code_image.set_from_pixbuf(pixbuf) + uri = compose_trust_uri( + app.get_client(self._account).get_own_jid(), + [self._omemo.backend.get_our_identity()]) + log.debug('Trust URI: %s', uri) + self._ui.qr_code_image.set_from_pixbuf(generate_qr_code(uri)) def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: self._ui.list.invalidate_filter() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fa79e9be46bbb0bce80e2283cbd57a9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fa79e9be46bbb0bce80e2283cbd57a9… 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