Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][sanitize-filenames] fix: Preview: Sanitize filename from disallowed chars
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch sanitize-filenames at gajim / gajim Commits: 9c89b3ef by wurstsalat at 2022-08-26T08:54:11+02:00 fix: Preview: Sanitize filename from disallowed chars Fixes #11105 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -37,7 +37,6 @@ import re import os import subprocess -import base64 import hashlib import shlex import socket @@ -58,7 +57,6 @@ from datetime import timedelta from urllib.parse import unquote from urllib.parse import urlparse -from encodings.punycode import punycode_encode from functools import wraps from pathlib import Path from packaging.version import Version as V @@ -358,26 +356,45 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: def sanitize_filename(filename: str) -> str: ''' - Make sure the filename we will write does contain only acceptable and latin - characters, and is not too long (in that case hash it) + Sanitize filename of elements not allowed on Windows + https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file ''' - # 48 is the limit - if len(filename) > 48: - hash_ = hashlib.md5(filename.encode('utf-8')) - filename = base64.b64encode(hash_.digest()).decode('utf-8') - - # make it latin chars only - filename = punycode_encode(filename).decode('utf-8') - filename = filename.replace('/', '_') - if os.name == 'nt': - filename = filename.replace('?', '_')\ - .replace(':', '_')\ - .replace('\\', '_')\ - .replace('"', "'")\ - .replace('|', '_')\ - .replace('*', '_')\ - .replace('<', '_')\ - .replace('>', '_') + disallowed_chars = [ + '<', + '>', + ':', + '"', + '/', + '\\', + '|', + '?', + '*', + '..', + 'CON', + 'PRN', + 'AUX', + 'NUL', + 'COM1', + 'COM2', + 'COM3', + 'COM4', + 'COM5', + 'COM6', + 'COM7', + 'COM8', + 'COM9', + 'LPT1', + 'LPT2', + 'LPT3', + 'LPT4', + 'LPT5', + 'LPT6', + 'LPT7', + 'LPT8', + 'LPT9', + ] + for char in disallowed_chars: + filename = filename.replace(char, '_') return filename ===================================== gajim/common/preview_helpers.py ===================================== @@ -45,6 +45,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ log = logging.getLogger('gajim.c.preview_helpers') @@ -315,6 +316,8 @@ def get_image_paths(uri: str, # so the filename should not exceed 90 web_stem = web_stem[:90] + web_stem = sanitize_filename(web_stem) + name_hash = hashlib.sha1(str(uri).encode()).hexdigest() orig_filename = f'{web_stem}_{name_hash}{extension}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c89b3ef64e0189df0ead1d855ca45f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c89b3ef64e0189df0ead1d855ca45f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][sanitize-filenames] fix: Preview: Sanitize filename from disallowed chars
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch sanitize-filenames at gajim / gajim Commits: a1638def by wurstsalat at 2022-08-26T08:53:08+02:00 fix: Preview: Sanitize filename from disallowed chars Fixes #11105 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -358,26 +358,45 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: def sanitize_filename(filename: str) -> str: ''' - Make sure the filename we will write does contain only acceptable and latin - characters, and is not too long (in that case hash it) + Sanitize filename of elements not allowed on Windows + https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file ''' - # 48 is the limit - if len(filename) > 48: - hash_ = hashlib.md5(filename.encode('utf-8')) - filename = base64.b64encode(hash_.digest()).decode('utf-8') - - # make it latin chars only - filename = punycode_encode(filename).decode('utf-8') - filename = filename.replace('/', '_') - if os.name == 'nt': - filename = filename.replace('?', '_')\ - .replace(':', '_')\ - .replace('\\', '_')\ - .replace('"', "'")\ - .replace('|', '_')\ - .replace('*', '_')\ - .replace('<', '_')\ - .replace('>', '_') + disallowed_chars = [ + '<', + '>', + ':', + '"', + '/', + '\\', + '|', + '?', + '*', + '..', + 'CON', + 'PRN', + 'AUX', + 'NUL', + 'COM1', + 'COM2', + 'COM3', + 'COM4', + 'COM5', + 'COM6', + 'COM7', + 'COM8', + 'COM9', + 'LPT1', + 'LPT2', + 'LPT3', + 'LPT4', + 'LPT5', + 'LPT6', + 'LPT7', + 'LPT8', + 'LPT9', + ] + for char in disallowed_chars: + filename = filename.replace(char, '_') return filename ===================================== gajim/common/preview_helpers.py ===================================== @@ -45,6 +45,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ log = logging.getLogger('gajim.c.preview_helpers') @@ -315,6 +316,8 @@ def get_image_paths(uri: str, # so the filename should not exceed 90 web_stem = web_stem[:90] + web_stem = sanitize_filename(web_stem) + name_hash = hashlib.sha1(str(uri).encode()).hexdigest() orig_filename = f'{web_stem}_{name_hash}{extension}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1638def1b0c96ec82c83800ea20f4ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1638def1b0c96ec82c83800ea20f4ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch sanitize-filenames
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed new branch sanitize-filenames at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/sanitize-filenames You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch public-encryption-button
by Daniel Brötzmann (＠wurstsalat) 24 Aug '22

24 Aug '22

Daniel Brötzmann deleted branch public-encryption-button at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MessageActionsBox: Disable encryption button if MUC is public
by Philipp Hörist (＠lovetox) 24 Aug '22

24 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a6b117a by wurstsalat at 2022-08-24T20:48:16+02:00 imprv: MessageActionsBox: Disable encryption button if MUC is public Fixes #10959 - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/data/gui/message_actions_box.ui - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,15 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def encryption_available(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return True + + return (disco_info.muc_is_members_only and + disco_info.muc_is_nonanonymous) + def get_config_value(self, field_name: str) -> Any: disco_info = self.get_disco() assert disco_info is not None ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> @@ -91,7 +91,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> <property name="relief">none</property> <child> <object class="GtkImage" id="encryption_image"> ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -219,9 +219,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_settings_menu(contact) - encryption = self._contact.settings.get('encryption') - self._set_encryption_state(encryption) - self._set_encryption_details(encryption) + self._update_encryption_button() + self._update_encryption_details_button() self._set_chatstate(True) @@ -286,18 +285,6 @@ def _set_chatstate(self, state: bool) -> None: self._client.get_module('Chatstate').set_chatstate( self._contact, Chatstate.INACTIVE) - def _set_encryption_state(self, state: str) -> None: - action = app.window.get_action('set-encryption') - action.set_state(GLib.Variant('s', state)) - - if state in ('OMEMO', 'OpenPGP', 'PGP'): - icon_name = 'channel-secure-symbolic' - else: - icon_name = 'channel-insecure-symbolic' - - self._ui.encryption_image.set_from_icon_name(icon_name, - Gtk.IconSize.MENU) - def _change_encryption(self, action: Gio.SimpleAction, param: GLib.Variant @@ -319,13 +306,43 @@ def _change_encryption(self, if not plugin.activate_encryption(app.window.get_control()): return - self._set_encryption_state(new_state) contact = self.get_current_contact() contact.settings.set('encryption', new_state) - self._set_encryption_details(new_state) + self._update_encryption_button() + self._update_encryption_details_button() + + def _update_encryption_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') + + action = app.window.get_action('set-encryption') + action.set_state(GLib.Variant('s', state)) + + sensitive = True + tooltip = _('Choose encryption') + + if state in ('OMEMO', 'OpenPGP', 'PGP'): + icon_name = 'channel-secure-symbolic' + else: + icon_name = 'channel-insecure-symbolic' + + if isinstance(self._contact, GroupchatContact): + if not self._contact.encryption_available: + sensitive = False + tooltip = _('This is a public group chat. ' + 'Encryption is not available.') + icon_name = 'channel-insecure-symbolic' + + self._ui.encryption_menu_button.set_sensitive(sensitive) + self._ui.encryption_menu_button.set_tooltip_text(tooltip) + self._ui.encryption_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + + def _update_encryption_details_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') - def _set_encryption_details(self, state: str) -> None: encryption_state = {'visible': bool(state), 'enc_type': state, 'authenticated': False} @@ -341,19 +358,22 @@ def _set_encryption_details(self, state: str) -> None: if authenticated: authenticated_string = _('and authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-high-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-high-symbolic' else: authenticated_string = _('and NOT authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-low-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-low-symbolic' tooltip = _('%(type)s encryption is active %(authenticated)s.') % { - 'type': enc_type, 'authenticated': authenticated_string} + 'type': enc_type, + 'authenticated': authenticated_string} + + if isinstance(self._contact, GroupchatContact) and visible: + visible = self._contact.encryption_available - self._ui.encryption_details_button.set_tooltip_text(tooltip) self._ui.encryption_details_button.set_visible(visible) - self._ui.encryption_details_image.set_sensitive(visible) + self._ui.encryption_details_button.set_tooltip_text(tooltip) + self._ui.encryption_details_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a6b117ae383248b077540c3bb3e3981… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a6b117ae383248b077540c3bb3e3981… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][public-encryption-button] 2 commits: chore: Update DOAP file
by Daniel Brötzmann (＠wurstsalat) 24 Aug '22

24 Aug '22

Daniel Brötzmann pushed to branch public-encryption-button at gajim / gajim Commits: 0e17e748 by wurstsalat at 2022-08-24T20:23:34+02:00 chore: Update DOAP file - - - - - 8a6b117a by wurstsalat at 2022-08-24T20:48:16+02:00 imprv: MessageActionsBox: Disable encryption button if MUC is public Fixes #10959 - - - - - 4 changed files: - data/gajim.doap - gajim/common/modules/contacts.py - gajim/data/gui/message_actions_box.ui - gajim/gtk/message_actions_box.py Changes: ===================================== data/gajim.doap ===================================== @@ -170,8 +170,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0071.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>1.4</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -343,8 +344,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0174.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>2.0</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -673,7 +675,7 @@ <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/> <xmpp:status>complete</xmpp:status> - <xmpp:version>0.2</xmpp:version> + <xmpp:version>0.2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,15 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def encryption_available(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return True + + return (disco_info.muc_is_members_only and + disco_info.muc_is_nonanonymous) + def get_config_value(self, field_name: str) -> Any: disco_info = self.get_disco() assert disco_info is not None ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> @@ -91,7 +91,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> <property name="relief">none</property> <child> <object class="GtkImage" id="encryption_image"> ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -219,9 +219,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_settings_menu(contact) - encryption = self._contact.settings.get('encryption') - self._set_encryption_state(encryption) - self._set_encryption_details(encryption) + self._update_encryption_button() + self._update_encryption_details_button() self._set_chatstate(True) @@ -286,18 +285,6 @@ def _set_chatstate(self, state: bool) -> None: self._client.get_module('Chatstate').set_chatstate( self._contact, Chatstate.INACTIVE) - def _set_encryption_state(self, state: str) -> None: - action = app.window.get_action('set-encryption') - action.set_state(GLib.Variant('s', state)) - - if state in ('OMEMO', 'OpenPGP', 'PGP'): - icon_name = 'channel-secure-symbolic' - else: - icon_name = 'channel-insecure-symbolic' - - self._ui.encryption_image.set_from_icon_name(icon_name, - Gtk.IconSize.MENU) - def _change_encryption(self, action: Gio.SimpleAction, param: GLib.Variant @@ -319,13 +306,43 @@ def _change_encryption(self, if not plugin.activate_encryption(app.window.get_control()): return - self._set_encryption_state(new_state) contact = self.get_current_contact() contact.settings.set('encryption', new_state) - self._set_encryption_details(new_state) + self._update_encryption_button() + self._update_encryption_details_button() + + def _update_encryption_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') + + action = app.window.get_action('set-encryption') + action.set_state(GLib.Variant('s', state)) + + sensitive = True + tooltip = _('Choose encryption') + + if state in ('OMEMO', 'OpenPGP', 'PGP'): + icon_name = 'channel-secure-symbolic' + else: + icon_name = 'channel-insecure-symbolic' + + if isinstance(self._contact, GroupchatContact): + if not self._contact.encryption_available: + sensitive = False + tooltip = _('This is a public group chat. ' + 'Encryption is not available.') + icon_name = 'channel-insecure-symbolic' + + self._ui.encryption_menu_button.set_sensitive(sensitive) + self._ui.encryption_menu_button.set_tooltip_text(tooltip) + self._ui.encryption_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + + def _update_encryption_details_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') - def _set_encryption_details(self, state: str) -> None: encryption_state = {'visible': bool(state), 'enc_type': state, 'authenticated': False} @@ -341,19 +358,22 @@ def _set_encryption_details(self, state: str) -> None: if authenticated: authenticated_string = _('and authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-high-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-high-symbolic' else: authenticated_string = _('and NOT authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-low-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-low-symbolic' tooltip = _('%(type)s encryption is active %(authenticated)s.') % { - 'type': enc_type, 'authenticated': authenticated_string} + 'type': enc_type, + 'authenticated': authenticated_string} + + if isinstance(self._contact, GroupchatContact) and visible: + visible = self._contact.encryption_available - self._ui.encryption_details_button.set_tooltip_text(tooltip) self._ui.encryption_details_button.set_visible(visible) - self._ui.encryption_details_image.set_sensitive(visible) + self._ui.encryption_details_button.set_tooltip_text(tooltip) + self._ui.encryption_details_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3c6005b904370a486c9ec58da92683… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3c6005b904370a486c9ec58da92683… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update DOAP file
by Daniel Brötzmann (＠wurstsalat) 24 Aug '22

24 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0e17e748 by wurstsalat at 2022-08-24T20:23:34+02:00 chore: Update DOAP file - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -170,8 +170,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0071.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>1.4</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -343,8 +344,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0174.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>2.0</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -673,7 +675,7 @@ <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/> <xmpp:status>complete</xmpp:status> - <xmpp:version>0.2</xmpp:version> + <xmpp:version>0.2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0e17e7482a57b4546a989768d444afdc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0e17e7482a57b4546a989768d444afdc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][public-encryption-button] 4 commits: ci: Fix debian build
by Daniel Brötzmann (＠wurstsalat) 24 Aug '22

24 Aug '22

Daniel Brötzmann pushed to branch public-encryption-button at gajim / gajim Commits: 7fd1302e by Yann Leboulanger at 2022-08-22T21:24:44+02:00 ci: Fix debian build - - - - - 9015e908 by lovetox at 2022-08-22T22:03:32+02:00 ci: Remove deprecated report type - - - - - 846a5a11 by wurstsalat at 2022-08-23T11:49:15+02:00 imprv: Increase contrast for message row meta elements - - - - - b3c6005b by wurstsalat at 2022-08-24T19:53:19+02:00 imprv: MessageActionsBox: Disable encryption button if MUC is public Fixes #10959 - - - - - 7 changed files: - .gitlab-ci.yml - + debian/compat - debian/control - gajim/common/modules/contacts.py - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/message_actions_box.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -62,7 +62,9 @@ test-unittest: coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: - cobertura: coverage.xml + coverage_report: + coverage_format: cobertura + path: coverage.xml interruptible: true build-linux: ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper-compat (= 13), + debhelper (>= 13), dh-python, gettext (>= 0.17-4), libglib2.0-dev, @@ -13,6 +13,7 @@ Build-Depends: python3-gi-cairo, python3-nbxmpp-nightly (>=20220727), python3-setuptools, + python3-packaging, python3-pil, gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,15 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def encryption_available(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return True + + return (disco_info.muc_is_members_only and + disco_info.muc_is_nonanonymous) + def get_config_value(self, field_name: str) -> Any: disco_info = self.get_disco() assert disco_info is not None ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> @@ -91,7 +91,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> <property name="relief">none</property> <child> <object class="GtkImage" id="encryption_image"> ===================================== gajim/data/style/gajim.css ===================================== @@ -95,7 +95,7 @@ .conversation-call-box label { font-size: 90%; } .conversation-meta { - color: @insensitive_fg_color; + opacity: 0.6; font-size: 90%; } .conversation-read-marker { ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -219,9 +219,22 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_settings_menu(contact) - encryption = self._contact.settings.get('encryption') - self._set_encryption_state(encryption) - self._set_encryption_details(encryption) + encryption_available = True + if isinstance(self._contact, GroupchatContact): + encryption_available = self._contact.encryption_available + if not encryption_available: + self._update_encryption_button( + False, + _('This is a public group chat. ' + 'Encryption is not available.'), + 'channel-insecure-symbolic') + + self._update_encryption_details_button(False) + + if encryption_available: + encryption = self._contact.settings.get('encryption') + self._set_encryption_state(encryption) + self._set_encryption_details(encryption) self._set_chatstate(True) @@ -295,8 +308,10 @@ def _set_encryption_state(self, state: str) -> None: else: icon_name = 'channel-insecure-symbolic' - self._ui.encryption_image.set_from_icon_name(icon_name, - Gtk.IconSize.MENU) + self._update_encryption_button( + True, + _('Choose encryption'), + icon_name) def _change_encryption(self, action: Gio.SimpleAction, @@ -341,19 +356,38 @@ def _set_encryption_details(self, state: str) -> None: if authenticated: authenticated_string = _('and authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-high-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-high-symbolic' else: authenticated_string = _('and NOT authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-low-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-low-symbolic' tooltip = _('%(type)s encryption is active %(authenticated)s.') % { - 'type': enc_type, 'authenticated': authenticated_string} + 'type': enc_type, + 'authenticated': authenticated_string} + + self._update_encryption_details_button(visible, tooltip, icon_name) + + def _update_encryption_button(self, + sensitive: bool, + tooltip: str, + icon_name: str + ) -> None: + + self._ui.encryption_menu_button.set_sensitive(sensitive) + self._ui.encryption_menu_button.set_tooltip_text(tooltip) + self._ui.encryption_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + + def _update_encryption_details_button(self, + visible: bool, + tooltip: Optional[str] = None, + icon_name: Optional[str] = None + ) -> None: - self._ui.encryption_details_button.set_tooltip_text(tooltip) self._ui.encryption_details_button.set_visible(visible) - self._ui.encryption_details_image.set_sensitive(visible) + self._ui.encryption_details_button.set_tooltip_text(tooltip) + self._ui.encryption_details_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2b54cb022f2a2c966a66b197af44cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2b54cb022f2a2c966a66b197af44cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Increase contrast for message row meta elements
by Daniel Brötzmann (＠wurstsalat) 23 Aug '22

23 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 846a5a11 by wurstsalat at 2022-08-23T11:49:15+02:00 imprv: Increase contrast for message row meta elements - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -95,7 +95,7 @@ .conversation-call-box label { font-size: 90%; } .conversation-meta { - color: @insensitive_fg_color; + opacity: 0.6; font-size: 90%; } .conversation-read-marker { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/846a5a11f817b50666ae214e5d196fac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/846a5a11f817b50666ae214e5d196fac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Remove deprecated report type
by Philipp Hörist (＠lovetox) 22 Aug '22

22 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9015e908 by lovetox at 2022-08-22T22:03:32+02:00 ci: Remove deprecated report type - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -62,7 +62,9 @@ test-unittest: coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: - cobertura: coverage.xml + coverage_report: + coverage_format: cobertura + path: coverage.xml interruptible: true build-linux: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9015e9082b0fed292f4bea7e36d71c01… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9015e9082b0fed292f4bea7e36d71c01… 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