Philipp Hörist pushed to branch master at gajim / gajim
Commits: 6acb06af by lovetox at 2022-03-20T13:53:17+01:00 Add get_global_proxy()
- - - - - 73113fc5 by lovetox at 2022-03-20T13:56:19+01:00 Rename get_user_proxy()
- - - - - 24900985 by lovetox at 2022-03-20T14:31:11+01:00 Add fallback param for get_account_proxy()
- - - - -
4 changed files:
- gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/preview.py
Changes:
===================================== gajim/common/client.py ===================================== @@ -46,7 +46,7 @@ from gajim.common.const import ClientState from gajim.common.const import SimpleClientState from gajim.common.helpers import get_custom_host -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_idle_status_message @@ -527,7 +527,7 @@ def _prepare_for_connect(self) -> None: 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN])
- proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is not None: self._client.set_proxy(proxy)
===================================== gajim/common/helpers.py ===================================== @@ -711,14 +711,21 @@ def get_retraction_text(account: str, moderator_jid: str, text += ' ' + _('Reason: %s') % reason return text
-def get_user_proxy(account: str) -> Optional[ProxyData]: - proxy_name = app.settings.get_account_setting(account, 'proxy') +def get_global_proxy() -> Optional[ProxyData]: + proxy_name = app.settings.get('global_proxy') if not proxy_name: - proxy_name = app.settings.get('global_proxy') - if not proxy_name: - return None + return None return get_proxy(proxy_name)
+def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: + proxy_name = app.settings.get_account_setting(account, 'proxy') + if proxy_name: + return get_proxy(proxy_name) + + if fallback: + return get_global_proxy() + return None + def get_proxy(proxy_name: str) -> Optional[ProxyData]: try: settings = app.settings.get_proxy_settings(proxy_name)
===================================== gajim/common/modules/httpupload.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule @@ -57,7 +57,7 @@ def __init__(self, con): self._session.props.user_agent = 'Gajim %s' % app.version
def _set_proxy_if_available(self): - proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is None: self._proxy_resolver = None self._session.props.proxy_resolver = None
===================================== gajim/common/preview.py ===================================== @@ -34,7 +34,7 @@ from gajim.common.helpers import load_file_async from gajim.common.helpers import write_file_async from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.preview_helpers import aes_decrypt from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import parse_fragment @@ -187,7 +187,7 @@ def _create_session(account: str) -> Tuple[ session.props.https_aliases = ['aesgcm'] session.props.ssl_strict = False
- proxy = get_user_proxy(account) + proxy = get_account_proxy(account) if proxy is None: resolver = None else:
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6e30706fdb2707a21716a2b5ad587487...