Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] ci: Add missing job
by Philipp Hörist (＠lovetox) 19 May '23

19 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6ce7136b by Philipp Hörist at 2023-05-19T08:54:20+02:00 ci: Add missing job - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,6 +4,7 @@ stages: - test - build - deploy + - publish test-pylint: stage: test View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6ce7136ba4221de9afd34948… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6ce7136ba4221de9afd34948… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ci: Add release publish step
by Philipp Hörist (＠lovetox) 18 May '23

18 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3c4d594d by Philipp Hörist at 2023-05-18T19:54:10+02:00 ci: Add release publish step - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -70,3 +70,17 @@ deploy-debian-nightly: --password=$FTP_PASS \ --directory=debian/nbxmpp/"$(date +'%Y%m%d')" \ debian_build + +publish-release: + image: nbxmpp-publish:latest + stage: publish + dependencies: [] + rules: + - if: '$CI_COMMIT_TAG' + script: + - > + release-helper create-release \ + $CI_PROJECT_ID \ + '$CI_JOB_TOKEN' \ + --version=$CI_COMMIT_TAG \ + --tag=$CI_COMMIT_TAG View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3c4d594dcbf5d7111abfa992… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3c4d594dcbf5d7111abfa992… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch http
by Philipp Hörist (＠lovetox) 18 May '23

18 May '23

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

1 0

[Git][gajim/gajim][master] imprv: GroupchatState: Show MAM sync
by Daniel Brötzmann (＠wurstsalat) 17 May '23

17 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 52d46908 by wurstsalat at 2023-05-18T00:33:50+02:00 imprv: GroupchatState: Show MAM sync - - - - - 4 changed files: - gajim/data/gui/groupchat_state.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list_row.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -115,6 +115,7 @@ <object class="GtkSpinner"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="active">True</property> </object> <packing> <property name="expand">False</property> @@ -139,9 +140,75 @@ </style> </object> <packing> - <property name="name">fetching</property> + <property name="name">mam-sync-started</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-error-symbolic</property> + <style> + <class name="error-color"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">There has been an error while trying to fetch messages.</property> + <property name="wrap">True</property> + <property name="max-width-chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Close</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_close_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="floating-overlay-box"/> + </style> + </object> + <packing> + <property name="name">mam-sync-error</property> + <property name="position">3</property> + </packing> + </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -95,6 +95,7 @@ .padding-left30 { padding-left: 30px; } .success-color { color: @success_color; } .error-color { color: @error_color; } .warning-color { color: @warning_color; } +.info-color { color: rgb(75, 150, 200); } .selected-color { color: @theme_selected_bg_color; } .insensitive-fg-color {color: @insensitive_fg_color;} .encrypted-color { color: rgb(75, 181, 67); } ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -517,6 +517,9 @@ def _connect_contact_signals(self) -> None: elif isinstance(self.contact, GroupchatContact): self.contact.connect('avatar-update', self._on_avatar_update) self.contact.connect('state-changed', self._on_muc_state_changed) + self.contact.connect('mam-sync-started', self._on_mam_sync_changed) + self.contact.connect('mam-sync-finished', self._on_mam_sync_changed) + self.contact.connect('mam-sync-error', self._on_mam_sync_changed) self._client.connect_signal('state-changed', self._on_client_state_changed) @@ -555,29 +558,55 @@ def _on_muc_state_changed(self, *args: Any) -> None: self._update_joined_state() 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') + self._reset_connection_icon() + context = self._ui.connection_icon.get_style_context() 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') + context.add_class('spin') + 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 not self._client.state.is_available): self._ui.connection_icon.set_from_icon_name( 'feather-zap-symbolic', Gtk.IconSize.MENU) - self._ui.connection_icon.get_style_context().add_class( - 'warning-color') + context.add_class('warning-color') self._ui.connection_icon.set_tooltip_text(_('Not connected')) self._ui.connection_icon.show() - else: - self._ui.connection_icon.hide() + + def _on_mam_sync_changed(self, + _contact: GroupchatContact, + signal_name: str + ) -> None: + + self._reset_connection_icon() + context = self._ui.connection_icon.get_style_context() + + if signal_name == 'mam-sync-started': + self._ui.connection_icon.set_from_icon_name( + 'feather-refresh-cw-symbolic', Gtk.IconSize.MENU) + context.add_class('spin') + context.add_class('info-color') + self._ui.connection_icon.set_tooltip_text(_('Fetching messages…')) + self._ui.connection_icon.show() + elif signal_name == 'mam-sync-error': + self._ui.connection_icon.set_from_icon_name( + 'feather-zap-symbolic', Gtk.IconSize.MENU) + context.add_class('error-color') + self._ui.connection_icon.set_tooltip_text( + _('There has been an error while trying to fetch messages.')) + self._ui.connection_icon.show() + + def _reset_connection_icon(self) -> None: + self._ui.connection_icon.hide() + context = self._ui.connection_icon.get_style_context() + context.remove_class('spin') + context.remove_class('dim-label') + context.remove_class('info-color') + context.remove_class('warning-color') + context.remove_class('error-color') def _on_muc_user_update(self, _contact: GroupchatParticipant, ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -59,6 +59,9 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self._contact = contact self._contact.connect('state-changed', self._on_muc_state_changed) + self._contact.connect('mam-sync-started', self._on_mam_sync_changed) + self._contact.connect('mam-sync-finished', self._on_mam_sync_changed) + self._contact.connect('mam-sync-error', self._on_mam_sync_changed) self._client = app.get_client(contact.account) self._client.connect_signal('state-changed', @@ -92,8 +95,20 @@ def _update_state(self, contact: GroupchatContact) -> None: self.set_visible(self._client.state.is_available and not contact.is_joined) - def set_fetching(self) -> None: - self._ui.groupchat_state.set_visible_child_name('fetching') + def _on_mam_sync_changed(self, + _contact: GroupchatContact, + signal_name: str + ) -> None: + + if signal_name in ('mam-sync-started', 'mam-sync-error'): + self.set_visible(True) + self._ui.groupchat_state.set_visible_child_name(signal_name) + return + + self.hide() + + def _on_close_clicked(self, _button: Gtk.Button) -> None: + self.hide() def _on_join_clicked(self, _button: Gtk.Button) -> None: assert self._contact is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52d469082e3e7bd5c061587f9cd31b1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52d469082e3e7bd5c061587f9cd31b1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Idle: Make attributes private
by Philipp Hörist (＠lovetox) 15 May '23

15 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e145689e by Philipp Hörist at 2023-05-15T21:57:31+02:00 refactor: Idle: Make attributes private - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== @@ -59,10 +59,10 @@ class DBusFreedesktop(IdleMonitor): def __init__(self) -> None: IdleMonitor.__init__(self) - self.last_idle_time = 0 + self._last_idle_time = 0 log.debug('Connecting to org.freedesktop.ScreenSaver') - self.dbus_proxy = Gio.DBusProxy.new_for_bus_sync( + self._dbus_proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, None, @@ -80,7 +80,7 @@ def __init__(self) -> None: log.debug('Test successful') def _get_idle_sec_fail(self) -> int: - (idle_time,) = cast(tuple[int], self.dbus_proxy.call_sync( + (idle_time,) = cast(tuple[int], self._dbus_proxy.call_sync( 'GetSessionIdleTime', None, Gio.DBusCallFlags.NO_AUTO_START, @@ -91,23 +91,23 @@ def _get_idle_sec_fail(self) -> int: def get_idle_sec(self) -> int: try: - self.last_idle_time = self._get_idle_sec_fail() + self._last_idle_time = self._get_idle_sec_fail() except GLib.Error as error: log.warning( 'org.freedesktop.ScreenSaver.GetSessionIdleTime() failed: %s', error) - return self.last_idle_time + return self._last_idle_time class DBusGnome(IdleMonitor): def __init__(self) -> None: IdleMonitor.__init__(self) - self.last_idle_time = 0 + self._last_idle_time = 0 log.debug('Connecting to org.gnome.Mutter.IdleMonitor') - self.dbus_gnome_proxy = Gio.DBusProxy.new_for_bus_sync( + self._dbus_proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, None, @@ -125,7 +125,7 @@ def __init__(self) -> None: log.debug('Test successful') def _get_idle_sec_fail(self) -> int: - (idle_time,) = cast(tuple[int], self.dbus_gnome_proxy.call_sync( + (idle_time,) = cast(tuple[int], self._dbus_proxy.call_sync( 'GetIdletime', None, Gio.DBusCallFlags.NO_AUTO_START, @@ -136,13 +136,13 @@ def _get_idle_sec_fail(self) -> int: def get_idle_sec(self) -> int: try: - self.last_idle_time = self._get_idle_sec_fail() + self._last_idle_time = self._get_idle_sec_fail() except GLib.Error as error: log.warning( 'org.gnome.Mutter.IdleMonitor.GetIdletime() failed: %s', error) - return self.last_idle_time + return self._last_idle_time class Xss(IdleMonitor): @@ -165,59 +165,60 @@ class XScreenSaverInfo(ctypes.Structure): xid = ctypes.c_ulong c_int_p = ctypes.POINTER(ctypes.c_int) - libX11path = ctypes.util.find_library('X11') - if libX11path is None: + lib_x11_path = ctypes.util.find_library('X11') + if lib_x11_path is None: raise OSError('libX11 could not be found.') - libX11 = ctypes.cdll.LoadLibrary(libX11path) - libX11.XOpenDisplay.restype = display_p - libX11.XOpenDisplay.argtypes = (ctypes.c_char_p,) - libX11.XDefaultRootWindow.restype = xid - libX11.XDefaultRootWindow.argtypes = (display_p,) - - libXsspath = ctypes.util.find_library('Xss') - if libXsspath is None: + + lib_x11 = ctypes.cdll.LoadLibrary(lib_x11_path) + lib_x11.XOpenDisplay.restype = display_p + lib_x11.XOpenDisplay.argtypes = (ctypes.c_char_p,) + lib_x11.XDefaultRootWindow.restype = xid + lib_x11.XDefaultRootWindow.argtypes = (display_p,) + + lib_xss_path = ctypes.util.find_library('Xss') + if lib_xss_path is None: raise OSError('libXss could not be found.') - self.libXss = ctypes.cdll.LoadLibrary(libXsspath) - self.libXss.XScreenSaverQueryExtension.argtypes = (display_p, - c_int_p, - c_int_p) - self.libXss.XScreenSaverAllocInfo.restype = XScreenSaverInfo_p - self.libXss.XScreenSaverQueryInfo.argtypes = ( + + self._lib_xss = ctypes.cdll.LoadLibrary(lib_xss_path) + self._lib_xss.XScreenSaverQueryExtension.argtypes = ( + display_p, c_int_p, c_int_p) + self._lib_xss.XScreenSaverAllocInfo.restype = XScreenSaverInfo_p + self._lib_xss.XScreenSaverQueryInfo.argtypes = ( display_p, xid, XScreenSaverInfo_p) - self.dpy_p = libX11.XOpenDisplay(None) - if self.dpy_p is None: + self._dpy_p = lib_x11.XOpenDisplay(None) + if self._dpy_p is None: raise OSError('Could not open X Display.') _event_basep = ctypes.c_int() _error_basep = ctypes.c_int() - extension = self.libXss.XScreenSaverQueryExtension( - self.dpy_p, ctypes.byref(_event_basep), ctypes.byref(_error_basep)) + extension = self._lib_xss.XScreenSaverQueryExtension( + self._dpy_p, ctypes.byref(_event_basep), ctypes.byref(_error_basep)) if extension == 0: raise OSError('XScreenSaver Extension not available on display.') - self.xss_info_p = self.libXss.XScreenSaverAllocInfo() - if self.xss_info_p is None: + self._xss_info_p = self._lib_xss.XScreenSaverAllocInfo() + if self._xss_info_p is None: raise OSError('XScreenSaverAllocInfo: Out of Memory.') - self.rootwindow = libX11.XDefaultRootWindow(self.dpy_p) + self.root_window = lib_x11.XDefaultRootWindow(self._dpy_p) def get_idle_sec(self) -> int: - info = self.libXss.XScreenSaverQueryInfo( - self.dpy_p, self.rootwindow, self.xss_info_p) + info = self._lib_xss.XScreenSaverQueryInfo( + self._dpy_p, self.root_window, self._xss_info_p) if info == 0: return info - return self.xss_info_p.contents.idle // 1000 + return self._xss_info_p.contents.idle // 1000 class Windows(IdleMonitor): def __init__(self) -> None: IdleMonitor.__init__(self) - self.OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop - self.CloseDesktop = ctypes.windll.user32.CloseDesktop - self.SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW - self.GetTickCount = ctypes.windll.kernel32.GetTickCount - self.GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + self._OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop + self._CloseDesktop = ctypes.windll.user32.CloseDesktop + self._SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW + self._GetTickCount = ctypes.windll.kernel32.GetTickCount + self._GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo self._locked_time = None @@ -227,12 +228,12 @@ class LastInputInfo(ctypes.Structure): ('dwTime', ctypes.c_uint) ] - self.lastInputInfo = LastInputInfo() - self.lastInputInfo.cbSize = ctypes.sizeof(self.lastInputInfo) + self._lastInputInfo = LastInputInfo() + self._lastInputInfo.cbSize = ctypes.sizeof(self._lastInputInfo) def get_idle_sec(self) -> int: - self.GetLastInputInfo(ctypes.byref(self.lastInputInfo)) - return int(self.GetTickCount() - self.lastInputInfo.dwTime) // 1000 + self._GetLastInputInfo(ctypes.byref(self._lastInputInfo)) + return int(self._GetTickCount() - self._lastInputInfo.dwTime) // 1000 def set_extended_away(self, state: bool) -> None: raise NotImplementedError @@ -241,7 +242,7 @@ def is_extended_away(self) -> bool: # Check if Screen Saver is running # 0x72 is SPI_GETSCREENSAVERRUNNING saver_runing = ctypes.c_int(0) - info = self.SystemParametersInfo( + info = self._SystemParametersInfo( 0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True @@ -249,9 +250,9 @@ def is_extended_away(self) -> bool: # Check if Screen is locked # Also a UAC prompt counts as locked # So just return True if we are more than 10 seconds locked - desk = self.OpenInputDesktop(0, False, 0) + desk = self._OpenInputDesktop(0, False, 0) unlocked = bool(desk) - self.CloseDesktop(desk) + self._CloseDesktop(desk) if unlocked: self._locked_time = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e145689e3317da0a020d3fded830ede8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e145689e3317da0a020d3fded830ede8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Idle: Use default xa implemantation for XSS backend
by Philipp Hörist (＠lovetox) 15 May '23

15 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53f6e762 by Philipp Hörist at 2023-05-15T21:05:35+02:00 fix: Idle: Use default xa implemantation for XSS backend Fixes #11522 - - - - - 25500014 by Philipp Hörist at 2023-05-15T21:09:19+02:00 refactor: Idle: Remove unnecessary method override The base class has the same implementation - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== @@ -99,9 +99,6 @@ def get_idle_sec(self) -> int: return self.last_idle_time - def is_extended_away(self) -> bool: - return self._extended_away - class DBusGnome(IdleMonitor): @@ -212,9 +209,6 @@ def get_idle_sec(self) -> int: return info return self.xss_info_p.contents.idle // 1000 - def set_extended_away(self, state: bool) -> None: - raise NotImplementedError - class Windows(IdleMonitor): def __init__(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49156380316ade2a9043d5904adfbdb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49156380316ade2a9043d5904adfbdb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: new: Add lru cache decorate with ttl
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: eeffaf9f by Philipp Hörist at 2023-05-14T21:21:48+02:00 new: Add lru cache decorate with ttl - - - - - bb78fa8b by Philipp Hörist at 2023-05-14T21:28:02+02:00 refactor: OMEMO: Simplify pre condition checks - Separate pre condition checks for group chats and single chats - Make more methods private - Use lru cache with ttl for device list and bundle queries - - - - - 49156380 by Philipp Hörist at 2023-05-14T21:35:09+02:00 refactor: OMEMO: Improve logging - - - - - 2 changed files: - gajim/common/modules/omemo.py - + gajim/common/util/decorators.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -76,6 +76,7 @@ from gajim.common.modules.util import prepare_stanza from gajim.common.storage.omemo import OMEMOStorage from gajim.common.structs import OutgoingMessage +from gajim.common.util.decorators import lru_cache_with_ttl ALLOWED_TAGS = [ ('request', Namespace.RECEIPTS), @@ -149,13 +150,9 @@ def __init__(self, client: types.Client) -> None: self._omemo_groupchats: set[str] = set() self._muc_temp_store: dict[bytes, str] = {} - self._query_for_bundles: list[str] = [] - self._device_bundle_querys: list[int] = [] - self._query_for_devicelists: list[str] = [] def _on_signed_in(self, _event: SignedIn) -> None: - self._log.info('Announce Support after Sign In') - self._query_for_bundles = [] + self._log.info('Publish our bundle after sign in') self.set_bundle() self.request_devicelist() @@ -180,8 +177,8 @@ def _on_room_joined(self, jid = str(contact.jid) self._check_if_omemo_capable(jid) - if self.is_omemo_groupchat(jid): - self.get_affiliation_list(jid) + if self._is_omemo_groupchat(jid): + self._get_affiliation_list(jid) def _on_republish_bundle(self, _session: OMEMOSessionManager, @@ -198,52 +195,79 @@ def backend(self) -> OMEMOSessionManager: def check_send_preconditions(self, contact: types.ChatContactT) -> bool: jid = str(contact.jid) if contact.is_groupchat: - if not self.is_omemo_groupchat(jid): - app.ged.raise_event(EncryptionInfo( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.BAD_OMEMO_CONFIG)) + if not self._groupchat_pre_conditions_satisfied(contact): return False - missing = True - for member_jid in self.backend.get_group_members(jid): - if not self.are_keys_missing(member_jid): - missing = False - if missing: - self._log.info('%s => No Trusted Fingerprints for %s', - contact.account, jid) - app.ged.raise_event(EncryptionInfo( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.NO_FINGERPRINTS)) - return False else: - # check if we have devices for the contact - if not self.backend.get_devices(jid, without_self=True): - self.request_devicelist(jid) - app.ged.raise_event(EncryptionInfo( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.QUERY_DEVICES)) + if not self._chat_pre_conditions_satisfied(contact): return False if self.backend.get_identity_infos(jid, only_active=True, trust=OMEMOTrust.UNDECIDED): - self._log.info('%s => Undecided Fingerprints for %s', - contact.account, jid) + self._log.info('Undecided keys for %s', 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', - contact.account, jid) + self._log.debug('Sending message to %s', jid) return True - def is_omemo_groupchat(self, room_jid: str) -> bool: + def _groupchat_pre_conditions_satisfied( + self, + contact: types.GroupchatContactT + ) -> bool: + + jid = str(contact.jid) + if not self._is_omemo_groupchat(jid): + app.ged.raise_event(EncryptionInfo( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.BAD_OMEMO_CONFIG)) + return False + + has_trusted_keys = False + for member_jid in self.backend.get_group_members(jid): + self._request_bundles_for_new_devices(member_jid) + if self._has_trusted_keys(member_jid): + has_trusted_keys = True + + if not has_trusted_keys: + self._log.info('No trusted keys for %s', jid) + app.ged.raise_event(EncryptionInfo( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.NO_FINGERPRINTS)) + return False + return True + + def _chat_pre_conditions_satisfied( + self, + contact: types.ChatContactT + ) -> bool: + + jid = str(contact.jid) + if not self.backend.get_devices(jid, without_self=True): + self.request_devicelist(jid) + app.ged.raise_event(EncryptionInfo( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.QUERY_DEVICES)) + return False + + if not self._has_trusted_keys(jid): + self._log.info('No trusted keys for %s', jid) + app.ged.raise_event(EncryptionInfo( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.NO_FINGERPRINTS)) + return False + return True + + def _is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats def encrypt_message(self, event: OutgoingMessage) -> bool: @@ -311,7 +335,7 @@ def _send_key_transport_message(self, return transport_message = get_key_transport_message(typ, jid, omemo_message) - self._log.info('Send key transport message %s (%s)', jid, devices) + self._log.info('Send key transport message to %s (%s)', jid, devices) self._client.send_stanza(transport_message) def _message_received(self, @@ -352,7 +376,7 @@ def _message_received(self, raise NodeProcessed if properties.omemo.payload not in self._muc_temp_store: - self._log.warning("Can't decrypt own GroupChat Message") + self._log.warning("Can't decrypt own group chat message") return plaintext = self._muc_temp_store[properties.omemo.payload] @@ -397,7 +421,7 @@ def _process_muc_message(self, return contact.real_jid.bare self._log.error( - 'Unable to find JID for group chat message from %s', resource) + 'Unable to find jid for group chat message from %s', resource) return None def _process_mam_message(self, @@ -408,7 +432,7 @@ def _process_mam_message(self, if properties.from_muc: self._log.info('MUC MAM Message received') if properties.muc_user is None or properties.muc_user.jid is None: - self._log.warning('Received MAM Message which can ' + self._log.warning('Received MAM message which can ' 'not be mapped to a real jid') return None return properties.muc_user.jid.bare @@ -439,13 +463,13 @@ def _on_muc_user_presence(self, else: self.backend.add_group_member(room, jid) - if self.is_omemo_groupchat(room): - if not self.is_contact_in_roster(jid): + if self._is_omemo_groupchat(room): + if not self._is_contact_in_roster(jid): # Query Devicelists from JIDs not in our Roster - self._log.info('%s not in Roster, query devicelist...', jid) - self.request_devicelist(jid) + self._log.info('%s not in roster, query devicelist...', jid) + self._request_device_list_ttl(jid) - def get_affiliation_list(self, room_jid: str) -> None: + def _get_affiliation_list(self, room_jid: str) -> None: for affiliation in ('owner', 'admin', 'member'): self._nbxmpp('MUC').get_affiliation( room_jid, @@ -465,12 +489,11 @@ def _on_affiliations_received(self, task: Task) -> None: jid = str(user_jid) self.backend.add_group_member(room_jid, jid) - if not self.is_contact_in_roster(jid): - # Query Devicelists from JIDs not in our Roster - self._log.info('%s not in Roster, query devicelist...', jid) - self.request_devicelist(jid) + if not self._is_contact_in_roster(jid): + self._log.info('%s not in roster, query devicelist...', jid) + self._request_device_list_ttl(jid) - def is_contact_in_roster(self, jid: str) -> bool: + def _is_contact_in_roster(self, jid: str) -> bool: if jid == self._own_jid: return True @@ -490,60 +513,19 @@ def _check_if_omemo_capable(self, jid: str) -> None: self._log.info('OMEMO room removed due to config change: %s', jid) self._omemo_groupchats.discard(jid) - def _check_for_missing_sessions(self, jid: str) -> None: - devices_without_session = self.backend.get_devices_without_sessions(jid) - for device_id in devices_without_session: - if device_id in self._device_bundle_querys: - continue - self._device_bundle_querys.append(device_id) - self.request_bundle(jid, device_id) - - def are_keys_missing(self, contact_jid: str) -> bool: - ''' Checks if devicekeys are missing and queries the - bundles - - Parameters - ---------- - contact_jid : str - bare jid of the contact - - Returns - ------- - bool - Returns True if there are no trusted Fingerprints - ''' - - # Fetch Bundles of own other Devices - if self._own_jid not in self._query_for_bundles: - - devices_without_session = self.backend.get_devices_without_sessions( - self._own_jid) - - self._query_for_bundles.append(self._own_jid) - - if devices_without_session: - for device_id in devices_without_session: - self.request_bundle(self._own_jid, device_id) - - # Fetch Bundles of contacts devices - if contact_jid not in self._query_for_bundles: - - devices_without_session = self.backend.get_devices_without_sessions( - contact_jid) - - self._query_for_bundles.append(contact_jid) - - if devices_without_session: - for device_id in devices_without_session: - self.request_bundle(contact_jid, device_id) + def _request_bundles_for_new_devices(self, jid_: str) -> None: + for jid in [jid_, self._own_jid]: + device_ids = self.backend.get_devices_without_sessions(jid) + for device_id in device_ids: + self._request_bundle_ttl(jid, device_id) + def _has_trusted_keys(self, jid: str) -> bool: if self.backend.get_identity_infos( - contact_jid, + jid, only_active=True, trust=[OMEMOTrust.VERIFIED, OMEMOTrust.BLIND]): - return False - - return True + return True + return False def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: if bundle is None: @@ -551,11 +533,15 @@ def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: self._nbxmpp('OMEMO').set_bundle(bundle, self.backend.get_our_device()) + @lru_cache_with_ttl(maxsize=512, ttl=7200) + def _request_bundle_ttl(self, jid: str, device_id: int) -> None: + self.request_bundle(jid, device_id) + @as_task def request_bundle(self, jid: str, device_id: int): _task = yield # noqa: F841 - self._log.info('Fetch device bundle %s %s', device_id, jid) + self._log.info('Request device bundle %s %s', device_id, jid) bundle = yield self._nbxmpp('OMEMO').request_bundle(jid, device_id) @@ -588,6 +574,10 @@ def clear_devicelist(self) -> None: self._own_jid, [self.backend.get_our_device()]) self.set_devicelist() + @lru_cache_with_ttl(maxsize=512, ttl=7200) + def _request_device_list_ttl(self, jid: str) -> None: + self.request_devicelist(jid) + @as_task def request_devicelist(self, jid: Optional[str] = None): _task = yield # noqa: F841 @@ -595,10 +585,7 @@ def request_devicelist(self, jid: Optional[str] = None): if jid is None: jid = self._own_jid - if jid in self._query_for_devicelists: - return - - self._query_for_devicelists.append(jid) + self._log.info('Request devicelist for %s', jid) devicelist = yield self._nbxmpp('OMEMO').request_devicelist(jid=jid) if is_error(devicelist) or devicelist is None: @@ -634,16 +621,13 @@ def _process_devicelist_update(self, # Pass a copy, we need the full list for potential set_devicelist() self.backend.update_devicelist(jid, list(devicelist)) - if jid in self._query_for_devicelists: - self._query_for_devicelists.remove(jid) - if own_devices: 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) - self._check_for_missing_sessions(jid) + self._request_bundles_for_new_devices(jid) def _debug_print_stanza(self, stanza: Any) -> None: stanzastr = '\n' + stanza.__str__(fancy=True) ===================================== gajim/common/util/decorators.py ===================================== @@ -0,0 +1,52 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from typing import Any + +from functools import lru_cache +from functools import wraps +from time import monotonic + + +def lru_cache_with_ttl(maxsize: int, + typed: bool = False, + ttl: int = 2 + ) -> Any: + '''LRU-Cache with TTL''' + + class Result: + __slots__ = ('value', 'timeout') + + def __init__(self, value: Any, timeout: float) -> None: + self.value = value + self.timeout = timeout + + def decorator(func: Any) -> Any: + @lru_cache(maxsize=maxsize, typed=typed) + def cached_func(*args: Any, **kwargs: Any) -> Result: + value = func(*args, **kwargs) + timeout = monotonic() + ttl + return Result(value, timeout) + + @wraps(func) + def wrapper(*args: Any, **kwargs: Any) -> Any: + result = cached_func(*args, **kwargs) + if result.timeout < monotonic(): + result.value = func(*args, **kwargs) + result.timeout = monotonic() + ttl + return result.value + + return wrapper + + return decorator View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3f8483c3b2a87a64610970fb74f2c74… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3f8483c3b2a87a64610970fb74f2c74… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: OMEMO: Remove JID from correct list after devicelist update
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3f8483c3 by Philipp Hörist at 2023-05-14T17:28:15+02:00 cfix: OMEMO: Remove JID from correct list after devicelist update - - - - - 1 changed file: - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -634,8 +634,8 @@ def _process_devicelist_update(self, # Pass a copy, we need the full list for potential set_devicelist() self.backend.update_devicelist(jid, list(devicelist)) - if jid in self._query_for_bundles: - self._query_for_bundles.remove(jid) + if jid in self._query_for_devicelists: + self._query_for_devicelists.remove(jid) if own_devices: if not self.backend.is_our_device_published(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f8483c3b2a87a64610970fb74f2c747… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f8483c3b2a87a64610970fb74f2c747… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: new: Archive: Allow to create Archive in memory
by Philipp Hörist (＠lovetox) 14 May '23

14 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa21ba4d by wurstsalat at 2023-05-14T14:42:34+00:00 new: Archive: Allow to create Archive in memory - - - - - 5784aa4a by wurstsalat at 2023-05-14T14:42:34+00:00 new: Tests: Add GUI test for ChatControl - - - - - 16618479 by wurstsalat at 2023-05-14T14:42:34+00:00 fix: ConversationView: Fix loading messages going forward from specific point Fixes #11201 - - - - - 5 changed files: - gajim/common/storage/archive.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - test/dialogs/__init__.py - + test/dialogs/conversation_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -162,10 +162,11 @@ class MessageExportRow(NamedTuple): class MessageArchiveStorage(SqliteStorage): - def __init__(self): + def __init__(self, in_memory: bool = False): + path = None if in_memory else configpaths.get('LOG_DB') SqliteStorage.__init__(self, log, - configpaths.get('LOG_DB'), + path, ARCHIVE_SQL_STATEMENT) self._jid_ids: dict[JID, JidsTableRow] = {} @@ -456,7 +457,7 @@ def get_conversation_around(self, jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR]) - n_lines = 20 + n_lines = 50 sql_before = ''' SELECT contact_name, time, kind, show, message, subject, ===================================== gajim/gtk/control.py ===================================== @@ -161,6 +161,7 @@ def switch_contact(self, contact: Union[BareContact, self._jump_to_end_button.switch_contact(contact) self._scrolled_view.switch_contact(contact) + self._request_history(None, True) self._groupchat_state.switch_contact(contact) self._roster.switch_contact(contact) @@ -590,17 +591,18 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: row = self._scrolled_view.get_row_by_log_line_id(log_line_id) if row is None: # Clear view and reload conversation around timestamp + self._scrolled_view.reset() self._scrolled_view.block_signals(True) - self.reset_view() before, at_after = app.storage.archive.get_conversation_around( self.contact.account, self.contact.jid, timestamp) self.add_messages(before) self.add_messages(at_after) + self._scrolled_view.set_history_complete(False, False) + GLib.idle_add(self._scrolled_view.block_signals, False) GLib.idle_add( self._scrolled_view.scroll_to_message_and_highlight, log_line_id) - GLib.idle_add(self._scrolled_view.block_signals, False) def _request_messages(self, before: bool) -> list[ConversationRow]: if before: @@ -638,7 +640,7 @@ def _request_events(self, before: bool) -> list[events.ApplicationEvent]: REQUEST_LINES_COUNT) def _request_history(self, - _scrolled: Gtk.ScrolledWindow, + _widget: Any, before: bool ) -> None: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -244,7 +244,6 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = False self._enable_signal_handlers(True) - self._emit('request-history', True) def get_autoscroll(self) -> bool: return self._autoscroll ===================================== test/dialogs/__init__.py ===================================== @@ -3,12 +3,13 @@ def require_versions(): gi.require_versions({'Gdk': '3.0', - 'GLib': '2.0', 'Gio': '2.0', + 'GLib': '2.0', + 'GObject': '2.0', 'Gtk': '3.0', 'GtkSource': '4', - 'GObject': '2.0', - 'Pango': '1.0'}) + 'Pango': '1.0', + 'PangoCairo': '1.0'}) require_versions() ===================================== test/dialogs/conversation_view.py ===================================== @@ -0,0 +1,122 @@ +import tempfile +from unittest.mock import MagicMock + +from gi.repository import Gdk +from gi.repository import Gtk +from nbxmpp.protocol import JID + +from gajim.common import app +from gajim.common import configpaths +from gajim.common.const import AvatarSize +from gajim.common.const import KindConstant +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import ContactSettings +from gajim.common.preview import PreviewManager +from gajim.common.settings import Settings +from gajim.common.storage.archive import MessageArchiveStorage +from gajim.common.storage.events import EventStorage + +from gajim.gtk.avatar import generate_default_avatar +from gajim.gtk.control import ChatControl + +ACCOUNT = 'me(a)test.tld' +FROM_JID = 'contact(a)test.tld' +BASE_TIMESTAMP = 1672531200 + + +class ConversationViewTest(Gtk.ApplicationWindow): + def __init__(self) -> None: + Gtk.ApplicationWindow.__init__(self) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_size_request(800, 800) + self.set_title('Test ConversationView') + + self._chat_control = ChatControl() + app.settings.set('hide_groupchat_occupants_list', True) + + contact = self._get_contact() + self._chat_control.switch_contact(contact) + + jump_to_button = Gtk.Button(label='Jump to 500') + jump_to_button.connect('clicked', self._on_jump_to_clicked) + button_box = Gtk.Box( + spacing=6, + halign=Gtk.Align.CENTER, + margin_bottom=6) + button_box.add(jump_to_button) + + box = Gtk.Box(spacing=6, orientation=Gtk.Orientation.VERTICAL) + box.add(self._chat_control.widget) + box.add(button_box) + self.add(box) + + self.show_all() + self.connect('key-press-event', self._on_key_press_event) + + def _get_contact(self) -> BareContact: + contact = MagicMock(spec='BareContact') + contact.connect = MagicMock() + contact.account = ACCOUNT + contact.jid = FROM_JID + contact.name = 'Test Contact' + contact.is_groupchat = False + avatar = generate_default_avatar( + 'T', + (0.2, 0.1, 0.7), + AvatarSize.ROSTER, + 1) + contact.get_avatar = MagicMock(return_value=avatar) + contact.settings = ContactSettings(ACCOUNT, JID.from_string(ACCOUNT)) + return contact + + def _on_key_press_event(self, + _widget: Gtk.Widget, + event: Gdk.EventKey + ) -> None: + + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_jump_to_clicked(self, _button: Gtk.Button) -> None: + self._chat_control.scroll_to_message(500, BASE_TIMESTAMP + 500) + + +def add_archive_messages() -> None: + timestamp = BASE_TIMESTAMP + for num in range(1000): + app.storage.archive.insert_into_logs( + ACCOUNT, + FROM_JID, + timestamp, + KindConstant.CHAT_MSG_RECV, + message=num, + stanza_id=num, + message_id=num) + timestamp += 1 + + +app.get_client = MagicMock() +app.window = MagicMock() + +app.settings = Settings(in_memory=True) +app.settings.init() +app.settings.add_account(ACCOUNT) + +app.storage.events = EventStorage() +app.storage.events.init() + +app.storage.archive = MessageArchiveStorage(in_memory=True) +app.storage.archive.init() +add_archive_messages() + +configpaths.set_separation(True) +configpaths.set_config_root(tempfile.gettempdir()) +configpaths.init() + +app.preview_manager = PreviewManager() + +win = ConversationViewTest() +win.connect('destroy', Gtk.main_quit) +win.show_all() + +Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e205b303e1f25da1a5d90072d5c6137… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e205b303e1f25da1a5d90072d5c6137… You're receiving this email because of your account on dev.gajim.org.

1 0

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

14 May '23

Philipp Hörist deleted branch sort-chat-list at gajim / gajim -- 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