Philipp Hörist pushed to branch master at gajim / gajim
Commits:
0cc9b18f by Marcin Mielniczuk at 2023-07-04T17:28:53+00:00
feat: Add setting for default encryption
- - - - -
2 changed files:
- gajim/common/setting_values.py
- gajim/gtk/accounts.py
Changes:
=====================================
gajim/common/setting_values.py
=====================================
@@ -436,6 +436,7 @@ class _ACCOUNTDEFAULT:
'default_workspace': '',
'enable_gssapi': False,
'enable_security_labels': False,
+ 'encryption_default': '',
'file_transfer_proxies': '',
'filetransfer_preference': 'httpupload',
'ft_send_local_ips': True,
@@ -480,7 +481,7 @@ class _ACCOUNTDEFAULT:
},
'contact': {
- 'encryption': '',
+ 'encryption': HAS_ACCOUNT_DEFAULT,
'mute_until': '',
'send_chatstate': HAS_ACCOUNT_DEFAULT,
'send_marker': HAS_ACCOUNT_DEFAULT,
=====================================
gajim/gtk/accounts.py
=====================================
@@ -783,7 +783,22 @@ def __init__(self, account: str) -> None:
'disabled': _('Disabled'),
}
+ encryption_entries = {
+ '': _('Unencrypted'),
+ 'OMEMO': 'OMEMO',
+ 'OpenPGP': 'OpenPGP',
+ 'PGP': 'PGP',
+ }
+
settings = [
+ Setting(SettingKind.POPOVER,
+ _('Default Encryption'),
+ SettingType.ACCOUNT_CONFIG,
+ 'encryption_default',
+ desc=_('Encryption method to use '
+ 'unless overridden on a per-contact basis'),
+ props={'entries': encryption_entries}),
+
Setting(SettingKind.SWITCH,
_('Idle Time'),
SettingType.ACCOUNT_CONFIG,
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0cc9b18f0d3b0621c85da8a237f099690283b4fb
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0cc9b18f0d3b0621c85da8a237f099690283b4fb
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
