Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix disabling Zeroconf account
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4394bb11 by Philipp Hörist at 2019-05-19T14:49:34Z Fix disabling Zeroconf account - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -107,7 +107,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): else: self.username = app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'name') - # END __init__ def check_jid(self, jid): return jid @@ -469,4 +468,5 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): error_msg=error_message, msg=None, time_=None, session=session, zeroconf=True)) -# END ConnectionZeroconf + def cleanup(self): + pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4394bb1174eaf78f11097c7272c26a0cbe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4394bb1174eaf78f11097c7272c26a0cbe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove getRoster() helper method
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 02915163 by Philipp Hörist at 2019-05-18T18:51:01Z Remove getRoster() helper method - - - - - e1bcbd2f by Philipp Hörist at 2019-05-19T14:10:14Z Move _compute_resource() into helper module - - - - - 7ec93f89 by Philipp Hörist at 2019-05-19T14:10:23Z Remove support for XEP-0096 (SI File Transfer) - - - - - fdfc9c90 by Philipp Hörist at 2019-05-19T14:10:27Z Move IBB code to new IBB module - - - - - 12 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/common/jingle_ftstates.py - gajim/common/modules/__init__.py - gajim/common/modules/gateway.py - + gajim/common/modules/ibb.py - gajim/common/modules/presence.py - gajim/common/protocol/bytestream.py - gajim/common/zeroconf/client_zeroconf.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/app.py ===================================== @@ -147,7 +147,6 @@ gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [ nbxmpp.NS_BYTESTREAM, - nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_COMMANDS, ===================================== gajim/common/connection.py ===================================== @@ -30,7 +30,6 @@ import sys import random -import socket import operator import time @@ -40,8 +39,6 @@ import logging import base64 import ssl from functools import partial -import string -from string import Template from urllib.request import urlopen from urllib.error import URLError @@ -101,7 +98,7 @@ class CommonConnection: self.connection = None # xmpppy ClientCommon instance self.is_zeroconf = False self.password = None - self.server_resource = self._compute_resource() + self.server_resource = helpers.get_resource(self.name) self.status = '' self.old_show = '' self.priority = app.get_priority(name, 'offline') @@ -148,18 +145,6 @@ class CommonConnection: con.UnregisterHandler(*handler) self.handlers_registered = False - def _compute_resource(self): - resource = app.config.get_per('accounts', self.name, 'resource') - # All valid resource substitution strings should be added to this hash. - if resource: - rand = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(8)) - resource = Template(resource).safe_substitute({ - 'hostname': socket.gethostname(), - 'rand': rand - }) - app.config.set_per('accounts', self.name, 'resource', resource) - return resource - def dispatch(self, event, data): """ Always passes account name as first param @@ -397,7 +382,7 @@ class CommonConnection: # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show - self.server_resource = self._compute_resource() + self.server_resource = helpers.get_resource(self.name) self.connect_and_init(show, msg) return @@ -1638,9 +1623,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection = con nbxmpp.features.getRegInfo(con, self._hostname) - def getRoster(self): - return self.get_module('Roster') - def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== @@ -34,7 +34,6 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.jingle import ConnectionJingle from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream -from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.connection_handlers_events import StreamReceivedEvent from gajim.common.connection_handlers_events import PresenceReceivedEvent from gajim.common.connection_handlers_events import StreamConflictReceivedEvent @@ -185,10 +184,9 @@ class ConnectionHandlersBase: class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionHandlersBase, - ConnectionJingle, ConnectionIBBytestream): + ConnectionJingle): def __init__(self): ConnectionSocks5Bytestream.__init__(self) - ConnectionIBBytestream.__init__(self) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) @@ -217,19 +215,12 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('iq', self._siSetCB, 'set', nbxmpp.NS_SI) - con.RegisterHandler('iq', self._siErrorCB, 'error', nbxmpp.NS_SI) - con.RegisterHandler('iq', self._siResultCB, 'result', nbxmpp.NS_SI) con.RegisterHandler('iq', self._bytestreamSetCB, 'set', nbxmpp.NS_BYTESTREAM) con.RegisterHandler('iq', self._bytestreamResultCB, 'result', nbxmpp.NS_BYTESTREAM) con.RegisterHandler('iq', self._bytestreamErrorCB, 'error', nbxmpp.NS_BYTESTREAM) - con.RegisterHandlerOnce('iq', self.IBBAllIqHandler) - con.RegisterHandler('iq', self.IBBIqHandler, ns=nbxmpp.NS_IBB) - con.RegisterHandler('message', self.IBBMessageHandler, ns=nbxmpp.NS_IBB) - con.RegisterHandler('iq', self._JingleCB, 'result') con.RegisterHandler('iq', self._JingleCB, 'error') con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) ===================================== gajim/common/helpers.py ===================================== @@ -45,11 +45,13 @@ import logging import json import shutil import collections +import random +import string +from string import Template from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode -from string import Template from functools import wraps import nbxmpp @@ -511,10 +513,10 @@ def reduce_chars_newlines(text, max_chars=0, max_lines=0): If any of the params is not present (None or 0) the action on it is not performed """ - def _cut_if_long(string): - if len(string) > max_chars: - string = string[:max_chars - 3] + '…' - return string + def _cut_if_long(string_): + if len(string_) > max_chars: + string_ = string_[:max_chars - 3] + '…' + return string_ if max_lines == 0: lines = text.split('\n') @@ -571,13 +573,13 @@ def datetime_tuple(timestamp): tim = tim.timetuple() return tim -def convert_bytes(string): +def convert_bytes(string_): suffix = '' # IEC standard says KiB = 1024 bytes KB = 1000 bytes # but do we use the standard? use_kib_mib = app.config.get('use_kib_mib') align = 1024. - bytes_ = float(string) + bytes_ = float(string_) if bytes_ >= align: bytes_ = round(bytes_/align, 1) if bytes_ >= align: @@ -846,10 +848,10 @@ def get_auth_sha(sid, initiator, target): return hashlib.sha1(("%s%s%s" % (sid, initiator, target)).encode('utf-8')).\ hexdigest() -def remove_invalid_xml_chars(string): - if string: - string = re.sub(app.interface.invalid_XML_chars_re, '', string) - return string +def remove_invalid_xml_chars(string_): + if string_: + string_ = re.sub(app.interface.invalid_XML_chars_re, '', string_) + return string_ def get_random_string_16(): """ @@ -1569,3 +1571,16 @@ def open_uri_with_custom(config_app, uri): def geo_provider_from_location(lat, lon): return ('https://www.openstreetmap.org/?' 'mlat=%s&mlon=%s&zoom=16') % (lat, lon) + + +def get_resource(account): + resource = app.config.get_per('accounts', account, 'resource') + # All valid resource substitution strings should be added to this hash. + if resource: + rand = ''.join(random.choice( + string.ascii_uppercase + string.digits) for _ in range(8)) + resource = Template(resource).safe_substitute( + {'hostname': socket.gethostname(), + 'rand': rand}) + app.config.set_per('accounts', account, 'resource', resource) + return resource ===================================== gajim/common/jingle_ftstates.py ===================================== @@ -146,8 +146,9 @@ class StateTransfering(JingleFileTransferStates): def _start_ibb_transfer(self, con): self.jft.file_props.transport_sid = self.jft.transport.sid fp = open(self.jft.file_props.file_name, 'rb') - con.OpenStream(self.jft.file_props.sid, self.jft.session.peerjid, fp, - blocksize=4096) + con.get_module('IBB').send_open(self.jft.session.peerjid, + self.jft.file_props.sid, + fp) def _start_sock5_transfer(self): # It tells wether we start the transfer as client or server ===================================== gajim/common/modules/__init__.py ===================================== @@ -74,6 +74,7 @@ MODULES = [ 'vcard_avatars', 'vcard_temp', 'announce', + 'ibb', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/modules/gateway.py ===================================== @@ -33,7 +33,7 @@ class Gateway(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._on_unsubscribe_result) - self._con.getRoster().del_item(agent) + self._con.get_module('Roster').del_item(agent) def _on_unsubscribe_result(self, stanza): if not nbxmpp.isResultNode(stanza): ===================================== gajim/common/modules/ibb.py ===================================== @@ -0,0 +1,227 @@ +# 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/>. + +# XEP-0047: In-Band Bytestreams + +import time + +import nbxmpp +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import StanzaHandler +from nbxmpp.util import is_error_result + +from gajim.common import app +from gajim.common.modules.base import BaseModule +from gajim.common.file_props import FilesProp + + +class IBB(BaseModule): + + _nbxmpp_extends = 'IBB' + _nbxmpp_methods = [ + 'send_open', + 'send_close', + 'send_data', + 'send_reply', + ] + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='iq', + callback=self._ibb_received, + ns=nbxmpp.NS_IBB), + ] + + def _ibb_received(self, _con, stanza, properties): + if not properties.is_ibb: + return + + if properties.ibb.type == 'data': + self._log.info('Data received, sid: %s, seq: %s', + properties.ibb.sid, properties.ibb.seq) + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + if file_props.connected: + self._on_data_received(stanza, file_props, properties) + self.send_reply(stanza) + + elif properties.ibb.type == 'open': + self._log.info('Open received, sid: %s, blocksize: %s', + properties.ibb.sid, properties.ibb.block_size) + + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + file_props.block_size = properties.ibb.block_size + file_props.direction = '<' + file_props.seq = 0 + file_props.received_len = 0 + file_props.last_time = time.time() + file_props.error = 0 + file_props.paused = False + file_props.connected = True + file_props.completed = False + file_props.disconnect_cb = None + file_props.continue_cb = None + file_props.syn_id = stanza.getID() + file_props.fp = open(file_props.file_name, 'wb') + self.send_reply(stanza) + + elif properties.ibb.type == 'close': + self._log.info('Close received, sid: %s', properties.ibb.sid) + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + self.send_reply(stanza) + file_props.fp.close() + file_props.completed = file_props.received_len >= file_props.size + if not file_props.completed: + file_props.error = -1 + app.socks5queue.complete_transfer_cb(self._account, file_props) + + raise NodeProcessed + + def _on_data_received(self, stanza, file_props, properties): + ibb = properties.ibb + if ibb.seq != file_props.seq: + self.send_reply(stanza, nbxmpp.ERR_UNEXPECTED_REQUEST) + self.send_close(file_props) + raise NodeProcessed + + self._log.debug('Data received: sid: %s, %s+%s bytes', + ibb.sid, file_props.fp.tell(), len(ibb.data)) + + file_props.seq += 1 + file_props.started = True + file_props.fp.write(ibb.data) + current_time = time.time() + file_props.elapsed_time += current_time - file_props.last_time + file_props.last_time = current_time + file_props.received_len += len(ibb.data) + app.socks5queue.progress_transfer_cb(self._account, file_props) + if file_props.received_len >= file_props.size: + file_props.completed = True + + def send_open(self, to, sid, fp): + self._log.info('Send open to %s, sid: %s', to, sid) + file_props = FilesProp.getFilePropBySid(sid) + file_props.direction = '>' + file_props.block_size = 4096 + file_props.fp = fp + file_props.seq = -1 + file_props.error = 0 + file_props.paused = False + file_props.received_len = 0 + file_props.last_time = time.time() + file_props.connected = True + file_props.completed = False + file_props.disconnect_cb = None + file_props.continue_cb = None + self._nbxmpp('IBB').send_open(to, + file_props.transport_sid, + 4096, + callback=self._on_open_result, + user_data=file_props) + return file_props + + def _on_open_result(self, result, file_props): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + self.send_data(file_props) + + def send_close(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + to = file_props.receiver + if file_props.direction == '<': + to = file_props.sender + + self._log.info('Send close to %s, sid: %s', + to, file_props.transport_sid) + self._nbxmpp('IBB').send_close(to, file_props.transport_sid, + callback=self._on_close_result) + + if file_props.completed: + app.socks5queue.complete_transfer_cb(self._account, file_props) + else: + if file_props.type_ == 's': + peerjid = file_props.receiver + else: + peerjid = file_props.sender + session = self._con.get_jingle_session( + peerjid, file_props.sid, 'file') + # According to the xep, the initiator also cancels + # the jingle session if there are no more files to send using IBB + if session.weinitiate: + session.cancel_session() + + def _on_close_result(self, result): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + + def send_data(self, file_props): + if file_props.completed: + self.send_close(file_props) + return + + chunk = file_props.fp.read(file_props.block_size) + if chunk: + file_props.seq += 1 + file_props.started = True + if file_props.seq == 65536: + file_props.seq = 0 + + self._log.info('Send data to %s, sid: %s', + file_props.receiver, file_props.transport_sid) + self._nbxmpp('IBB').send_data(file_props.receiver, + file_props.transport_sid, + file_props.seq, + chunk, + callback=self._on_data_result, + user_data=file_props) + current_time = time.time() + file_props.elapsed_time += current_time - file_props.last_time + file_props.last_time = current_time + file_props.received_len += len(chunk) + if file_props.size == file_props.received_len: + file_props.completed = True + app.socks5queue.progress_transfer_cb(self._account, file_props) + + def _on_data_result(self, result, file_props): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + self.send_data(file_props) + + +def get_instance(*args, **kwargs): + return IBB(*args, **kwargs), 'IBB' ===================================== gajim/common/modules/presence.py ===================================== @@ -305,15 +305,15 @@ class Presence(BaseModule): if not app.account_is_connected(self._account): return if remove_auth: - self._con.getRoster().del_item(jid) + self._con.get_module('Roster').del_item(jid) jid_list = app.config.get_per('contacts') for j in jid_list: if j.startswith(jid): app.config.del_per('contacts', j) else: self._log.info('Unsubscribe from %s', jid) - self._con.getRoster().unsubscribe(jid) - self._con.getRoster().set_item(jid) + self._con.get_module('Roster').unsubscribe(jid) + self._con.get_module('Roster').set_item(jid) def subscribe(self, jid, msg=None, name='', groups=None, auto_auth=False): if not app.account_is_connected(self._account): ===================================== gajim/common/protocol/bytestream.py ===================================== @@ -25,8 +25,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import socket -import base64 -import time import logging import nbxmpp @@ -34,7 +32,6 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient @@ -76,10 +73,6 @@ def is_transfer_stopped(file_props): class ConnectionBytestream: - def __init__(self): - app.ged.register_event_handler('file-request-received', ged.GUI1, - self._nec_file_request_received) - def pass_bytestream_disco(self, from_, identities, features, data, node): if nbxmpp.NS_BYTESTREAM not in features: return @@ -93,10 +86,6 @@ class ConnectionBytestream: default=self.name, testit=testit) raise nbxmpp.NodeProcessed - def cleanup(self): - app.ged.remove_event_handler('file-request-received', ged.GUI1, - self._nec_file_request_received) - def _ft_get_our_jid(self): our_jid = app.get_jid_from_account(self.name) resource = self.server_resource @@ -111,35 +100,6 @@ class ConnectionBytestream: def _ft_get_streamhost_jid_attr(self, streamhost): return helpers.parse_jid(streamhost.getAttr('jid')) - def send_file_request(self, file_props): - """ - Send iq for new FT request - """ - if not self.connection or self.connected < 2: - return - file_props.sender = self._ft_get_our_jid() - fjid = self._ft_get_receiver_jid(file_props) - iq = nbxmpp.Iq(to=fjid, typ='set') - iq.setID(file_props.sid) - si = iq.setTag('si', namespace=nbxmpp.NS_SI) - si.setAttr('profile', nbxmpp.NS_FILE) - si.setAttr('id', file_props.sid) - file_tag = si.setTag('file', namespace=nbxmpp.NS_FILE) - file_tag.setAttr('name', file_props.name) - file_tag.setAttr('size', file_props.size) - desc = file_tag.setTag('desc') - if file_props.desc: - desc.setData(file_props.desc) - file_tag.setTag('range') - feature = si.setTag('feature', namespace=nbxmpp.NS_FEATURE) - _feature = nbxmpp.DataForm(typ='form') - feature.addChild(node=_feature) - field = _feature.setField('stream-method') - field.setAttr('type', 'list-single') - field.addOption(nbxmpp.NS_BYTESTREAM) - field.addOption(nbxmpp.NS_IBB) - self.connection.send(iq) - def send_file_approval(self, file_props): """ Send iq, confirming that we want to download the file @@ -150,53 +110,33 @@ class ConnectionBytestream: # file transfer initiated by a jingle session log.info("send_file_approval: jingle session accept") - if file_props.session_type == 'jingle': - session = self.get_jingle_session(file_props.sender, - file_props.sid) - if not session: - return - content = None - for c in session.contents.values(): - if c.transport.sid == file_props.transport_sid: - content = c - break - if not content: - return - if not session.accepted: - content = session.get_content('file', content.name) - if content.use_security: - fingerprint = content.x509_fingerprint - if not jingle_xtls.check_cert( - app.get_jid_without_resource(file_props.sender), - fingerprint): - id_ = jingle_xtls.send_cert_request(self, - file_props.sender) - jingle_xtls.key_exchange_pend(id_, - content.on_cert_received, []) - return - session.approve_session() - - session.approve_content('file', content.name) - return - iq = nbxmpp.Iq(to=file_props.sender, typ='result') - iq.setAttr('id', file_props.request_id) - si = iq.setTag('si', namespace=nbxmpp.NS_SI) - if file_props.offset: - file_tag = si.setTag('file', namespace=nbxmpp.NS_FILE) - range_tag = file_tag.setTag('range') - range_tag.setAttr('offset', file_props.offset) - feature = si.setTag('feature', namespace=nbxmpp.NS_FEATURE) - _feature = nbxmpp.DataForm(typ='submit') - feature.addChild(node=_feature) - field = _feature.setField('stream-method') - field.delAttr('type') - if nbxmpp.NS_BYTESTREAM in file_props.stream_methods: - field.setValue(nbxmpp.NS_BYTESTREAM) - else: - file_props.transport_sid = file_props.sid - field.setValue(nbxmpp.NS_IBB) - self.connection.send(iq) + session = self.get_jingle_session(file_props.sender, + file_props.sid) + if not session: + return + content = None + for c in session.contents.values(): + if c.transport.sid == file_props.transport_sid: + content = c + break + if not content: + return + if not session.accepted: + content = session.get_content('file', content.name) + if content.use_security: + fingerprint = content.x509_fingerprint + if not jingle_xtls.check_cert( + app.get_jid_without_resource(file_props.sender), + fingerprint): + id_ = jingle_xtls.send_cert_request(self, + file_props.sender) + jingle_xtls.key_exchange_pend(id_, + content.on_cert_received, []) + return + session.approve_session() + + session.approve_content('file', content.name) def send_file_rejection(self, file_props, code='403', typ=None): """ @@ -208,87 +148,12 @@ class ConnectionBytestream: # user response to ConfirmationDialog may come after we've disconnected if not self.connection or self.connected < 2: return - if file_props.session_type == 'jingle': - if file_props.sid in self._sessions: - jingle = self._sessions[file_props.sid] - jingle.cancel_session() - return - iq = nbxmpp.Iq(to=file_props.sender, typ='error') - iq.setAttr('id', file_props.request_id) - if code == '400' and typ in ('stream', 'profile'): - name = 'bad-request' - text = '' - else: - name = 'forbidden' - text = 'Offer Declined' - err = nbxmpp.ErrorNode(code=code, typ='cancel', name=name, text=text) - if code == '400' and typ in ('stream', 'profile'): - if typ == 'stream': - err.setTag('no-valid-streams', namespace=nbxmpp.NS_SI) - else: - err.setTag('bad-profile', namespace=nbxmpp.NS_SI) - iq.addChild(node=err) - self.connection.send(iq) - def _siResultCB(self, con, iq_obj): - file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) - if not file_props: - return - if file_props.request_id: - # we have already sent streamhosts info - return - file_props.receiver = self._ft_get_from(iq_obj) - si = iq_obj.getTag('si') - file_tag = si.getTag('file') - range_tag = None - if file_tag: - range_tag = file_tag.getTag('range') - if range_tag: - offset = range_tag.getAttr('offset') - if offset: - file_props.offset = int(offset) - length = range_tag.getAttr('length') - if length: - file_props.length = int(length) - feature = si.setTag('feature') - if feature.getNamespace() != nbxmpp.NS_FEATURE: - return - form_tag = feature.getTag('x') - form = nbxmpp.DataForm(node=form_tag) - field = form.getField('stream-method') - if field.getValue() == nbxmpp.NS_BYTESTREAM: - self._send_socks5_info(file_props) - raise nbxmpp.NodeProcessed - if field.getValue() == nbxmpp.NS_IBB: - sid = file_props.sid - file_props.transport_sid = sid - fp = open(file_props.file_name, 'rb') - self.OpenStream(sid, file_props.receiver, fp) - raise nbxmpp.NodeProcessed - - def _siSetCB(self, con, iq_obj): - from gajim.common.connection_handlers_events import FileRequestReceivedEvent - app.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed + if file_props.sid in self._sessions: + jingle = self._sessions[file_props.sid] + jingle.cancel_session() + return - def _nec_file_request_received(self, obj): - pass - - def _siErrorCB(self, con, iq_obj): - si = iq_obj.getTag('si') - profile = si.getAttr('profile') - if profile != nbxmpp.NS_FILE: - return - file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) - if not file_props: - return - jid = self._ft_get_from(iq_obj) - file_props.error = -3 - from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, - jid=jid, file_props=file_props, error_msg='')) - raise nbxmpp.NodeProcessed class ConnectionSocks5Bytestream(ConnectionBytestream): @@ -766,259 +631,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): raise nbxmpp.NodeProcessed -class ConnectionIBBytestream(ConnectionBytestream): - - def __init__(self): - ConnectionBytestream.__init__(self) - self._streams = {} - - def IBBIqHandler(self, conn, stanza): - """ - Handles streams state change. Used internally. - """ - typ = stanza.getType() - log.debug('IBBIqHandler called typ->%s', typ) - if typ == 'set' and stanza.getTag('open'): - self.StreamOpenHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('close'): - self.StreamCloseHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('data'): - sid = stanza.getTagAttr('data', 'sid') - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if not file_props: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) - elif file_props.connected and self.IBBMessageHandler(conn, - stanza): - reply = stanza.buildReply('result') - reply.delChild('data') - conn.send(reply) - elif not file_props.connected: - log.debug('Received IQ for closed filetransfer, IQ dropped') - elif typ == 'error': - app.socks5queue.error_cb() - else: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_BAD_REQUEST)) - raise nbxmpp.NodeProcessed - - def StreamOpenHandler(self, conn, stanza): - """ - Handles opening of new incoming stream. Used internally. - """ - err = None - sid = stanza.getTagAttr('open', 'sid') - blocksize = stanza.getTagAttr('open', 'block-size') - log.debug('StreamOpenHandler called sid->%s blocksize->%s', - sid, blocksize) - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - try: - blocksize = int(blocksize) - except Exception: - err = nbxmpp.ERR_BAD_REQUEST - if not sid or not blocksize: - err = nbxmpp.ERR_BAD_REQUEST - elif not file_props: - err = nbxmpp.ERR_UNEXPECTED_REQUEST - if err: - rep = nbxmpp.Error(stanza, err) - else: - log.debug("Opening stream: id %s, block-size %s", - sid, blocksize) - rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', - stanza.getTo(), {'id': stanza.getID()}) - file_props.block_size = blocksize - file_props.direction = '<' - file_props.seq = 0 - file_props.received_len = 0 - file_props.last_time = time.time() - file_props.error = 0 - file_props.paused = False - file_props.connected = True - file_props.completed = False - file_props.disconnect_cb = None - file_props.continue_cb = None - file_props.syn_id = stanza.getID() - file_props.fp = open(file_props.file_name, 'wb') - conn.send(rep) - - def CloseIBBStream(self, file_props): - file_props.connected = False - file_props.fp.close() - file_props.stopped = True - to = file_props.receiver - if file_props.direction == '<': - to = file_props.sender - self.connection.send( - nbxmpp.Protocol('iq', to, 'set', - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':file_props.transport_sid})])) - if file_props.completed: - app.socks5queue.complete_transfer_cb(self.name, file_props) - elif file_props.session_type == 'jingle': - peerjid = \ - file_props.receiver if file_props.type_ == 's' else file_props.sender - session = self.get_jingle_session(peerjid, file_props.sid, 'file') - # According to the xep, the initiator also cancels the jingle session - # if there are no more files to send using IBB - if session.weinitiate: - session.cancel_session() - - def OpenStream(self, sid, to, fp, blocksize=4096): - """ - Start new stream. You should provide stream id 'sid', the endpoint jid - 'to', the file object containing info for send 'fp'. Also the desired - blocksize can be specified. - Take into account that recommended stanza size is 4k and IBB uses - base64 encoding that increases size of data by 1/3. - """ - file_props = FilesProp.getFilePropBySid(sid) - file_props.direction = '>' - file_props.block_size = blocksize - file_props.fp = fp - file_props.seq = 0 - file_props.error = 0 - file_props.paused = False - file_props.received_len = 0 - file_props.last_time = time.time() - file_props.connected = True - file_props.completed = False - file_props.disconnect_cb = None - file_props.continue_cb = None - syn = nbxmpp.Protocol('iq', to, 'set', payload=[nbxmpp.Node( - nbxmpp.NS_IBB + ' open', {'sid': file_props.transport_sid, - 'block-size': blocksize, 'stanza': 'iq'})]) - self.connection.send(syn) - file_props.syn_id = syn.getID() - return file_props - - def SendHandler(self, file_props): - """ - Send next portion of data if it is time to do it. Used internally. - """ - log.debug('SendHandler called') - if file_props.completed: - self.CloseIBBStream(file_props) - if file_props.paused: - return - if not file_props.connected: - #TODO: Reply with out of order error - return - chunk = file_props.fp.read(file_props.block_size) - if chunk: - datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', { - 'sid': file_props.transport_sid, - 'seq': file_props.seq}, - base64.b64encode(chunk).decode('ascii')) - file_props.seq += 1 - file_props.started = True - if file_props.seq == 65536: - file_props.seq = 0 - file_props.syn_id = self.connection.send( - nbxmpp.Protocol(name='iq', to=file_props.receiver, - typ='set', payload=[datanode])) - current_time = time.time() - file_props.elapsed_time += current_time - file_props.last_time - file_props.last_time = current_time - file_props.received_len += len(chunk) - if file_props.size == file_props.received_len: - file_props.completed = True - app.socks5queue.progress_transfer_cb(self.name, - file_props) - else: - log.debug('Nothing to read, but file not completed') - - def IBBMessageHandler(self, conn, stanza): - """ - Receive next portion of incoming datastream and store it write - it to temporary file. Used internally. - """ - sid = stanza.getTagAttr('data', 'sid') - seq = stanza.getTagAttr('data', 'seq') - data = stanza.getTagData('data') - log.debug('ReceiveHandler called sid->%s seq->%s', sid, seq) - try: - seq = int(seq) - data = base64.b64decode(data.encode('utf-8')) - except Exception: - seq = '' - data = b'' - err = None - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props is None: - err = nbxmpp.ERR_ITEM_NOT_FOUND - else: - if not data: - err = nbxmpp.ERR_BAD_REQUEST - elif seq != file_props.seq: - err = nbxmpp.ERR_UNEXPECTED_REQUEST - else: - log.debug('Successfully received sid->%s %s+%s bytes', - sid, file_props.fp.tell(), len(data)) - file_props.seq += 1 - file_props.started = True - file_props.fp.write(data) - current_time = time.time() - file_props.elapsed_time += current_time - file_props.last_time - file_props.last_time = current_time - file_props.received_len += len(data) - app.socks5queue.progress_transfer_cb(self.name, file_props) - if file_props.received_len >= file_props.size: - file_props.completed = True - if err: - log.debug('Error on receive: %s', err) - conn.send(nbxmpp.Error(nbxmpp.Iq(to=stanza.getFrom(), - frm=stanza.getTo(), - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close')]), err, reply=0)) - else: - return True - - def StreamCloseHandler(self, conn, stanza): - """ - Handle stream closure due to all data transmitted. - Raise xmpppy event specifying successful data receive. - """ - sid = stanza.getTagAttr('close', 'sid') - log.debug('StreamCloseHandler called sid->%s', sid) - # look in sending files - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props: - reply = stanza.buildReply('result') - reply.delChild('close') - conn.send(reply) - # look in receiving files - file_props.fp.close() - file_props.completed = file_props.received_len >= file_props.size - if not file_props.completed: - file_props.error = -1 - app.socks5queue.complete_transfer_cb(self.name, file_props) - else: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) - - - def IBBAllIqHandler(self, conn, stanza): - """ - Handle remote side reply about if it agree or not to receive our - datastream. - Used internally. Raises xmpppy event specifying if the data transfer - is agreed upon. - """ - syn_id = stanza.getID() - log.debug('IBBAllIqHandler called syn_id->%s', syn_id) - for file_props in FilesProp.getAllFileProp(): - if not file_props.direction or not file_props.connected: - # It's socks5 bytestream - # Or we closed the IBB stream - continue - if file_props.syn_id == syn_id: - if stanza.getType() == 'error': - if file_props.direction[0] == '<': - conn.Event('IBB', 'ERROR ON RECEIVE', file_props) - else: - conn.Event('IBB', 'ERROR ON SEND', file_props) - elif stanza.getType() == 'result': - self.SendHandler(file_props) - break - - class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): def _ft_get_from(self, iq_obj): ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -327,11 +327,6 @@ class P2PClient(IdleObject): self.RegisterHandler(*StanzaHandler(name='message', callback=self._caller._messageCB)) - self.RegisterHandler('iq', self._caller._siSetCB, 'set', nbxmpp.NS_SI) - self.RegisterHandler('iq', self._caller._siErrorCB, 'error', - nbxmpp.NS_SI) - self.RegisterHandler('iq', self._caller._siResultCB, 'result', - nbxmpp.NS_SI) self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set', nbxmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result', ===================================== gajim/gtk/filetransfer.py ===================================== @@ -29,7 +29,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 from gajim import gtkgui_helpers @@ -352,17 +351,10 @@ class FileTransfersWindow: file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER_5): - log.info('contact %s supports jingle file transfer', - contact.get_full_jid()) - app.connections[account].start_file_transfer(contact.get_full_jid(), - file_props) - self.add_transfer(account, contact, file_props) - else: - log.info('contact does not support jingle file transfer') - file_props.transport_sid = file_props.sid - app.connections[account].send_file_request(file_props) - self.add_transfer(account, contact, file_props) + + app.connections[account].start_file_transfer(contact.get_full_jid(), + file_props) + self.add_transfer(account, contact, file_props) return True def _start_receive(self, file_path, account, contact, file_props): @@ -890,7 +882,7 @@ class FileTransfersWindow: con = app.connections[account] # Check if we are in a IBB transfer if file_props.direction: - con.CloseIBBStream(file_props) + con.get_module('IBB').send_close(file_props) con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2e50ac5205c99f22eda1b51231bb320ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2e50ac5205c99f22eda1b51231bb320ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add IBB (XEP-0047) module
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ac23d278 by Philipp Hörist at 2019-05-19T13:33:48Z Add IBB (XEP-0047) module - - - - - 3 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/ibb.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -68,6 +68,7 @@ from nbxmpp.modules.annotations import Annotations from nbxmpp.modules.muclumbus import Muclumbus from nbxmpp.modules.software_version import SoftwareVersion from nbxmpp.modules.adhoc import AdHoc +from nbxmpp.modules.ibb import IBB from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -204,6 +205,7 @@ class XMPPDispatcher(PlugIn): self._modules['Muclumbus'] = Muclumbus(self._owner) self._modules['SoftwareVersion'] = SoftwareVersion(self._owner) self._modules['AdHoc'] = AdHoc(self._owner) + self._modules['IBB'] = IBB(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/ibb.py ===================================== @@ -0,0 +1,160 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import Error as ErrorStanza +from nbxmpp.protocol import ERR_BAD_REQUEST +from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Iq +from nbxmpp.protocol import NS_IBB +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import CommonResult +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import IBBData +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + +log = logging.getLogger('nbxmpp.m.ibb') + + +class IBB: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._process_ibb, + ns=NS_IBB, + priority=20), + ] + + def _process_ibb(self, _con, stanza, properties): + if properties.type.is_set: + open_ = stanza.getTag('open', namespace=NS_IBB) + if open_ is not None: + properties.ibb = self._parse_open(stanza, open_) + return + + close = stanza.getTag('close', namespace=NS_IBB) + if close is not None: + properties.ibb = self._parse_close(stanza, close) + return + + data = stanza.getTag('data', namespace=NS_IBB) + if data is not None: + properties.ibb = self._parse_data(stanza, data) + return + + def _parse_open(self, stanza, open_): + attrs = open_.getAttrs() + try: + block_size = int(attrs.get('block-size')) + except Exception as error: + log.warning(error) + log.warning(stanza) + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + if block_size > 65535: + log.warning('Invalid block-size') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + sid = attrs.get('sid') + if not sid: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + type_ = attrs.get('stanza') + if type_ == 'message': + self._client.send(ErrorStanza(stanza, ERR_FEATURE_NOT_IMPLEMENTED)) + raise NodeProcessed + + return IBBData(type='open', block_size=block_size, sid=sid) + + def _parse_close(self, stanza, close): + sid = close.getAttrs().get('sid') + if sid is None: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + return IBBData(type='close', sid=sid) + + def _parse_data(self, stanza, data): + attrs = data.getAttrs() + + sid = attrs.get('sid') + if sid is None: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + try: + seq = int(attrs.get('seq')) + except Exception: + log.exception('Invalid seq') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + try: + decoded_data = b64decode(data.getData(), return_type=bytes) + except Exception: + log.exception('Failed to decode IBB data') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + return IBBData(type='data', sid=sid, seq=seq, data=decoded_data) + + def send_reply(self, stanza, error=None): + if error is None: + reply = stanza.buildReply('result') + reply.getChildren().clear() + else: + reply = ErrorStanza(stanza, error) + self._client.send(reply) + + @call_on_response('_default_response') + def send_open(self, jid, sid, block_size): + iq = Iq('set', to=jid) + iq.addChild('open', + {'block-size': block_size, 'sid': sid, 'stanza': 'iq'}, + namespace=NS_IBB) + return iq + + @call_on_response('_default_response') + def send_close(self, jid, sid): + iq = Iq('set', to=jid) + iq.addChild('close', {'sid': sid}, namespace=NS_IBB) + return iq + + @call_on_response('_default_response') + def send_data(self, jid, sid, seq, data): + iq = Iq('set', to=jid) + ibb_data = iq.addChild('data', {'sid': sid, 'seq': seq}, namespace=NS_IBB) + ibb_data.setData(b64encode(data)) + return iq + + @callback + def _default_response(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/structs.py ===================================== @@ -109,6 +109,9 @@ SoftwareVersionResult = namedtuple('SoftwareVersionResult', 'name version os') AdHocCommandNote = namedtuple('AdHocCommandNote', 'text type') +IBBData = namedtuple('IBBData', 'block_size sid seq type data') +IBBData.__new__.__defaults__ = (None, None, None, None, None) + class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): __slots__ = [] @@ -285,11 +288,16 @@ class IqProperties: self.query = None self.payload = None self.http_auth = None + self.ibb = None @property def is_http_auth(self): return self.http_auth is not None + @property + def is_ibb(self): + return self.ibb is not None + class PresenceProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ac23d278b5323960b9054535ea… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ac23d278b5323960b9054535ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move roster methods into Roster module
by Philipp Hörist 17 May '19

17 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22b33885 by Philipp Hörist at 2019-05-17T23:30:37Z Move roster methods into Roster module - - - - - 2e50ac52 by Philipp Hörist at 2019-05-17T23:31:09Z Remove unused code - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/modules/roster.py - gajim/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -355,17 +355,6 @@ class CommonConnection: additional_data=obj.additional_data, stanza_id=obj.stanza_id) - def update_contact(self, jid, name, groups): - if self.connection: - self.getRoster().set_item(jid=jid, name=name, groups=groups) - - def update_contacts(self, contacts): - """ - Update multiple roster items - """ - if self.connection: - self.getRoster().set_item_multi(contacts) - def new_account(self, name, config, sync=False): """ To be implemented by derived classes @@ -378,9 +367,6 @@ class CommonConnection: """ raise NotImplementedError - def account_changed(self, new_name): - self.name = new_name - def send_agent_status(self, agent, ptype): """ To be implemented by derived classes ===================================== gajim/common/modules/roster.py ===================================== @@ -270,6 +270,17 @@ class Roster(BaseModule): """ return self._get_item_data(jid, 'name') + def update_contact(self, jid, name, groups): + if app.account_is_connected(self._account): + self.set_item(jid=jid, name=name, groups=groups) + + def update_contacts(self, contacts): + """ + Update multiple roster items + """ + if app.account_is_connected(self._account): + self.set_item_multi(contacts) + def set_item(self, jid, name=None, groups=None): """ Rename contact 'jid' and sets the groups list that it now belongs to ===================================== gajim/dialogs.py ===================================== @@ -97,8 +97,9 @@ class EditGroupsDialog: self.dialog.show_all() if self.changes_made: for (contact, account) in self.list_: - app.connections[account].update_contact(contact.jid, - contact.name, contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + contact.jid, contact.name, contact.groups) def on_edit_groups_dialog_response(self, widget, response_id): if response_id == Gtk.ResponseType.CLOSE: @@ -1066,8 +1067,9 @@ class RosterItemExchangeWindow: groups = [] for u in app.contacts.get_contact(self.account, jid): u.name = model[iter_][2] - app.connections[self.account].update_contact(jid, - model[iter_][2], groups) + con = app.connections[self.account] + con.get_module('Roster').update_contact( + jid, model[iter_][2], groups) self.draw_contact(jid, self.account) # Update opened chat ctrl = app.interface.msg_win_mgr.get_control(jid, self.account) ===================================== gajim/roster_window.py ===================================== @@ -898,7 +898,8 @@ class RosterWindow: changed_contacts.append({'jid': jid, 'name': contact.name, 'groups':contact.groups}) - app.connections[acc].update_contacts(changed_contacts) + app.connections[acc].get_module('Roster').update_contacts( + changed_contacts) for c in changed_contacts: self.add_contact(c['jid'], acc) @@ -929,8 +930,9 @@ class RosterWindow: # we might be dropped from meta to group contact.groups.append(group) if update: - app.connections[account].update_contact(jid, contact.name, - contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, contact.name, contact.groups) self.add_contact(jid, account) @@ -957,8 +959,9 @@ class RosterWindow: # Needed when we remove from "General" or "Observers" contact.groups.remove(group) if update: - app.connections[account].update_contact(jid, contact.name, - contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, contact.name, contact.groups) self.add_contact(jid, account) # Also redraw old groups @@ -2890,8 +2893,9 @@ class RosterWindow: contacts = app.contacts.get_contacts(account, jid) for contact in contacts: contact.name = new_text - app.connections[account].update_contact(jid, new_text, \ - contacts[0].groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, new_text, contacts[0].groups) self.draw_contact(jid, account) # Update opened chats for ctrl in app.interface.msg_win_mgr.get_controls(jid, @@ -4075,8 +4079,9 @@ class RosterWindow: _contact.groups = c_dest.groups[:] app.contacts.add_metacontact(account_dest, c_dest.jid, _account, _contact.jid, contacts) - app.connections[account_source].update_contact(_contact.jid, - _contact.name, _contact.groups) + con = app.connections[account_source] + con.get_module('Roster').update_contact( + _contact.jid, _contact.name, _contact.groups) # Re-add all and update GUI new_family = app.contacts.get_metacontacts_family(account_source, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f601ca0d7b8ac0b471491bf5181e7b6cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f601ca0d7b8ac0b471491bf5181e7b6cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove custom status per contact feature
by Philipp Hörist 17 May '19

17 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dbac0f0 by Philipp Hörist at 2019-05-17T21:38:06Z Remove custom status per contact feature - - - - - f601ca0d by Philipp Hörist at 2019-05-17T23:04:11Z Add dedicated announce/motd module - - - - - 11 changed files: - gajim/app_actions.py - gajim/common/connection.py - gajim/common/modules/__init__.py - + gajim/common/modules/announce.py - gajim/common/modules/privacylists.py - gajim/data/gui/contact_context_menu.ui - gajim/gtk/single_message.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -277,9 +277,7 @@ def on_update_motd(action, param): def on_delete_motd(action, param): account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/delete' - app.connections[account].send_motd(server) + app.connections[account].get_module('Announce').delete_motd() # Help Actions ===================================== gajim/common/connection.py ===================================== @@ -1566,14 +1566,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) - def send_motd(self, jid, subject='', msg='', xhtml=None): - if not app.account_is_connected(self.name): - return - msg_iq = nbxmpp.Message(to=jid, body=msg, subject=subject, - xhtml=xhtml) - - self.connection.send(msg_iq) - def _nec_message_outgoing(self, obj): if obj.account != self.name: return ===================================== gajim/common/modules/__init__.py ===================================== @@ -73,6 +73,7 @@ MODULES = [ 'user_tune', 'vcard_avatars', 'vcard_temp', + 'announce', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/modules/announce.py ===================================== @@ -0,0 +1,37 @@ +# 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/>. + +# Server MOTD and Announce + +import nbxmpp + +from gajim.common.modules.base import BaseModule + + +class Announce(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) + + def delete_motd(self): + server = self._con.get_own_jid().getDomain() + jid = '%s/announce/motd/delete' % server + self.set_announce(jid) + + def set_announce(self, jid, subject=None, body=None): + message = nbxmpp.Message(to=jid, body=body, subject=subject) + self._nbxmpp().send(message) + + +def get_instance(*args, **kwargs): + return Announce(*args, **kwargs), 'Announce' ===================================== gajim/common/modules/privacylists.py ===================================== @@ -242,23 +242,6 @@ class PrivacyLists(BaseModule): def _build_invisible_rule(self): node = nbxmpp.Node('list', {'name': 'invisible'}) iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) - if (self._account in app.interface.status_sent_to_groups and - app.interface.status_sent_to_groups[self._account]): - for group in app.interface.status_sent_to_groups[self._account]: - item = node.setTag('item', {'type': 'group', - 'value': group, - 'action': 'allow', - 'order': '1'}) - item.setTag('presence-out') - - if (self._account in app.interface.status_sent_to_users and - app.interface.status_sent_to_users[self._account]): - for jid in app.interface.status_sent_to_users[self._account]: - item = node.setTag('item', {'type': 'jid', - 'value': jid, - 'action': 'allow', - 'order': '2'}) - item.setTag('presence-out') item = node.setTag('item', {'action': 'deny', 'order': '3'}) item.setTag('presence-out') ===================================== gajim/data/gui/contact_context_menu.ui ===================================== @@ -51,21 +51,6 @@ <property name="can_focus">False</property> </object> </child> - <child> - <object class="GtkMenuItem" id="send_custom_status_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Send Cus_tom Status</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - </child> - </object> - </child> <child> <object class="GtkMenuItem" id="execute_command_menuitem"> <property name="visible">True</property> ===================================== gajim/gtk/single_message.py ===================================== @@ -308,8 +308,9 @@ class SingleMessageWindow(Gtk.ApplicationWindow): return True if '/announce/' in to_whom_jid: - app.connections[self.account].send_motd(to_whom_jid, subject, - message) + con = app.connections[self.account] + con.get_module('Announce').set_announce( + to_whom_jid, subject, message) continue recipient_list.append(to_whom_jid) ===================================== gajim/gui_interface.py ===================================== @@ -311,13 +311,6 @@ class Interface: account = obj.conn.name jid = obj.jid - # unset custom status - if (obj.old_show == 0 and obj.new_show > 1) or \ - (obj.old_show > 1 and obj.new_show == 0 and obj.conn.connected > 1): - if account in self.status_sent_to_users and \ - jid in self.status_sent_to_users[account]: - del self.status_sent_to_users[account][jid] - if app.jid_is_transport(jid): # It must be an agent @@ -2272,8 +2265,6 @@ class Interface: # This is the manager and factory of message windows set by the module self.msg_win_mgr = None self.minimized_controls = {} - self.status_sent_to_users = {} - self.status_sent_to_groups = {} self.pass_dialog = {} self.db_error_dialog = None ===================================== gajim/gui_menu_builder.py ===================================== @@ -221,7 +221,6 @@ control=None, gc_contact=None, is_anonymous=True): send_file_menuitem = xml.get_object('send_file_menuitem') information_menuitem = xml.get_object('information_menuitem') history_menuitem = xml.get_object('history_menuitem') - send_custom_status_menuitem = xml.get_object('send_custom_status_menuitem') send_single_message_menuitem = xml.get_object('send_single_message_menuitem') invite_menuitem = xml.get_object('invite_menuitem') block_menuitem = xml.get_object('block_menuitem') @@ -327,7 +326,7 @@ control=None, gc_contact=None, is_anonymous=True): # Zeroconf Account if app.config.get_per('accounts', account, 'is_zeroconf'): - for item in (send_custom_status_menuitem, send_single_message_menuitem, + for item in (send_single_message_menuitem, invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem, unignore_menuitem, subscription_menuitem, manage_contact_menuitem, convert_to_gc_menuitem): @@ -348,22 +347,6 @@ control=None, gc_contact=None, is_anonymous=True): # normal account - # send custom status icon - blocked = False - if helpers.jid_is_blocked(account, jid): - blocked = True - else: - for group in contact.get_shown_groups(): - if helpers.group_is_blocked(account, group): - blocked = True - break - transport = app.get_transport_name_from_jid(jid, use_config_setting=False) - if transport and transport != 'jabber': - # Transport contact, send custom status unavailable - send_custom_status_menuitem.set_sensitive(False) - elif blocked: - send_custom_status_menuitem.set_sensitive(False) - if gc_contact: if not gc_contact.jid: # it's a pm and we don't know real JID @@ -387,16 +370,6 @@ control=None, gc_contact=None, is_anonymous=True): if app.account_is_disconnected(account): invite_menuitem.set_sensitive(False) - # One or several resource, we do the same for send_custom_status - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - # icon MUST be different instance for every item - status_menuitem = Gtk.MenuItem.new_with_label(helpers.get_uf_show(s)) - status_menuitem.connect('activate', roster.on_send_custom_status, - [(contact, account)], s) - status_menuitems.append(status_menuitem) - send_single_message_menuitem.connect('activate', roster.on_send_single_message_menuitem_activate, account, contact) @@ -447,7 +420,7 @@ control=None, gc_contact=None, is_anonymous=True): if app.account_is_disconnected(account): for widget in (send_single_message_menuitem, subscription_menuitem, add_to_roster_menuitem, remove_from_roster_menuitem, - execute_command_menuitem, send_custom_status_menuitem): + execute_command_menuitem): widget.set_sensitive(False) @@ -507,24 +480,6 @@ def get_transport_menu(contact, account): if helpers.jid_is_blocked(account, jid): blocked = True - # Send Custom Status - send_custom_status_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('Send Cus_tom Status')) - if blocked: - send_custom_status_menuitem.set_sensitive(False) - else: - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - status_menuitem = Gtk.MenuItem.new_with_label(helpers.get_uf_show( - s)) - status_menuitem.connect('activate', roster.on_send_custom_status, - [(contact, account)], s) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - if app.account_is_disconnected(account): - send_custom_status_menuitem.set_sensitive(False) - item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) ===================================== gajim/roster_window.py ===================================== @@ -2113,10 +2113,6 @@ class RosterWindow: app.SHOW_LIST.index('invisible') app.connections[account].change_status(status, txt, auto) - if account in app.interface.status_sent_to_users: - app.interface.status_sent_to_users[account] = {} - if account in app.interface.status_sent_to_groups: - app.interface.status_sent_to_groups[account] = {} for gc_control in app.interface.msg_win_mgr.get_controls( message_control.TYPE_GC) + \ list(app.interface.minimized_controls[account].values()): @@ -3362,67 +3358,6 @@ class RosterWindow: 'offline.') % jids ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) - def on_send_custom_status(self, widget, contact_list, show, group=None): - """ - Send custom status - """ - # contact_list has only one element except if group != None - def on_response(message, pep_dict): - if message is None: # None if user pressed Cancel - return - account_list = [] - for (contact, account) in contact_list: - if account not in account_list: - account_list.append(account) - # 1. update status_sent_to_[groups|users] list - if group: - for account in account_list: - if account not in app.interface.status_sent_to_groups: - app.interface.status_sent_to_groups[account] = {} - app.interface.status_sent_to_groups[account][group] = show - else: - for (contact, account) in contact_list: - if account not in app.interface.status_sent_to_users: - app.interface.status_sent_to_users[account] = {} - app.interface.status_sent_to_users[account][contact.jid] \ - = show - - # 2. update privacy lists if main status is invisible - for account in account_list: - if app.SHOW_LIST[app.connections[account].connected] == \ - 'invisible': - con = app.connections[account] - con.get_module('PrivacyLists').set_invisible_rule() - - # 3. send directed presence - for (contact, account) in contact_list: - our_jid = app.get_jid_from_account(account) - jid = contact.jid - if jid == our_jid: - jid += '/' + contact.resource - self.send_status(account, show, message, to=jid) - - def send_it(is_checked=None): - if is_checked is not None: # dialog has been shown - if is_checked: # user does not want to be asked again - app.config.set('confirm_custom_status', 'no') - else: - app.config.set('confirm_custom_status', 'yes') - self.get_status_message(show, on_response, show_pep=False, - always_ask=True) - - confirm_custom_status = app.config.get('confirm_custom_status') - if confirm_custom_status == 'no': - send_it() - return - pritext = _('You are about to send a custom status. Are you sure you ' - 'want to continue?') - sectext = _('This contact will temporarily see you as %(status)s, ' - 'but only until you change your status. Then they will see ' - 'your global status.') % {'status': show} - ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=send_it) - def on_status_combobox_changed(self, widget): """ When we change our status via the combobox @@ -5025,30 +4960,13 @@ class RosterWindow: list_online, show_bookmarked=show_bookmarked) menu.append(invite_menuitem) - # Send Custom Status - send_custom_status_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('Send Cus_tom Status')) - if helpers.group_is_blocked(account, group): - send_custom_status_menuitem.set_sensitive(False) - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - status_menuitem = Gtk.MenuItem.new_with_label( - helpers.get_uf_show(s)) - status_menuitem.connect('activate', self.on_send_custom_status, - list_, s, group) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - # there is no singlemessage and custom status for zeroconf if app.config.get_per('accounts', account, 'is_zeroconf'): - send_custom_status_menuitem.set_sensitive(False) send_group_message_item.set_sensitive(False) if app.connections[account].connected < 2: send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) - send_custom_status_menuitem.set_sensitive(False) if not group in helpers.special_groups: item = Gtk.SeparatorMenuItem.new() # separator ===================================== test/lib/gajim_mocks.py ===================================== @@ -104,7 +104,6 @@ class MockInterface(Mock): self.instances = {} self.minimized_controls = {} - self.status_sent_to_users = Mock() class MockLogger(Mock): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f8492ae694f6d3dbb705f9b1d84f1ecc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f8492ae694f6d3dbb705f9b1d84f1ecc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdHoc: Show error page if no commands are available
by Philipp Hörist 16 May '19

16 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9f8492ae by Philipp Hörist at 2019-05-16T21:34:15Z AdHoc: Show error page if no commands are available - Remove some unused code Fixes #9704 - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -137,7 +137,12 @@ class AdHocCommand(Gtk.Assistant): if button is not None: button.show() - elif page in (Page.ERROR, Page.COMPLETED): + elif page == Page.ERROR: + error_page = self.get_nth_page(page) + if error_page.show_command_button: + self._buttons['commands'].show() + + elif page == Page.COMPLETED: self._buttons['commands'].show() def _add_page(self, page): @@ -155,6 +160,10 @@ class AdHocCommand(Gtk.Assistant): dataform = None if action == AdHocAction.EXECUTE: command = self.get_nth_page(current_page).get_selected_command() + if command is None: + # The commands page should not show if there are no commands, + # but if for some reason it does dont fail horribly + return else: command, dataform = self.get_nth_page(current_page).stage_data if action == AdHocAction.PREV: @@ -178,9 +187,19 @@ class AdHocCommand(Gtk.Assistant): @ensure_not_destroyed def _received_command_list(self, commands): + error_text = None if is_error_result(commands): + error_text = str(commands) + + elif not commands: + error_text = _('No commands available') + + if error_text is not None: + self.get_nth_page(Page.ERROR).set_text(error_text) + self.get_nth_page(Page.ERROR).show_command_button = False self.set_current_page(Page.ERROR) return + self.get_nth_page(Page.COMMANDS).add_commands(commands) self.set_current_page(Page.COMMANDS) @@ -188,6 +207,7 @@ class AdHocCommand(Gtk.Assistant): def _received_stage(self, stage): if is_error_result(stage): self.get_nth_page(Page.ERROR).set_text(str(stage)) + self.get_nth_page(Page.ERROR).show_command_button = True self.set_current_page(Page.ERROR) return @@ -211,12 +231,6 @@ class AdHocCommand(Gtk.Assistant): def _on_page_change(self, _assistant, _page): self._set_button_visibility(self.get_current_page()) - def _on_error(self, error_text): - log.info('Show Error page') - page = self.get_nth_page(Page.ERROR) - page.set_text(error_text) - self.set_current_page(Page.ERROR) - def _on_cancel(self, _widget): self.destroy() @@ -443,6 +457,7 @@ class Error(Gtk.Box): super().__init__(orientation=Gtk.Orientation.VERTICAL) self.set_spacing(12) self.set_homogeneous(True) + self._show_command_button = False icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', Gtk.IconSize.DIALOG) @@ -458,3 +473,11 @@ class Error(Gtk.Box): def set_text(self, text): self._label.set_text(text) + + @property + def show_command_button(self): + return self._show_command_button + + @show_command_button.setter + def show_command_button(self, value): + self._show_command_button = value View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9f8492ae694f6d3dbb705f9b1d84f1eccc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9f8492ae694f6d3dbb705f9b1d84f1eccc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Unify display of URLs in status messages
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c823ef6c by Daniel Brötzmann at 2019-05-15T21:23:46Z Unify display of URLs in status messages Status messages in group chats and private chats are now displayed in the same way as status messages in single chat windows. This avoids trailing brackets to be appended to a possible hyperlink inside the status message. Fixes #8470 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/privatechat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1854,7 +1854,7 @@ class GroupchatControl(ChatControlBase): nick = event.properties.muc_nickname status = event.properties.status - status = '' if status is None else ' (%s)' % status + status = '' if status is None else ' - %s' % status show = helpers.get_uf_show(event.properties.show.value) status_default = app.config.get('print_status_muc_default') ===================================== gajim/privatechat_control.py ===================================== @@ -132,7 +132,7 @@ class PrivateChatControl(ChatControl): nick = event.properties.muc_nickname status = event.properties.status - status = '' if status is None else ' (%s)' % status + status = '' if status is None else ' - %s' % status show = helpers.get_uf_show(event.properties.show.value) status_default = app.config.get('print_status_muc_default') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c823ef6cebf77dfa52fa3737e46dde7da4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c823ef6cebf77dfa52fa3737e46dde7da4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix proxy auth
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0a116941 by Philipp Hörist at 2019-05-15T19:17:33Z Fix proxy auth - - - - - 1 changed file: - nbxmpp/proxy_connectors.py Changes: ===================================== nbxmpp/proxy_connectors.py ===================================== @@ -152,7 +152,7 @@ class SOCKS5Connector(ProxyConnector): self.on_failure('Invalid proxy reply') return if self._to_int(reply[1]) == 0: - return self._on_proxy_auth('\x01\x00') + return self._on_proxy_auth(b'\x01\x00') elif self._to_int(reply[1]) == 2: to_send = '\x01' + chr(len(self.proxy_user)) + self.proxy_user +\ chr(len(self.proxy_pass)) + self.proxy_pass @@ -176,14 +176,11 @@ class SOCKS5Connector(ProxyConnector): log.error('Invalid proxy reply') self.on_failure('Invalid proxy reply') return - if reply[0] != '\x01': - log.error('Invalid proxy reply') - self.on_failure('Invalid proxy reply') - return - if reply[1] != '\x00': + if reply != b'\x01\x00': log.error('Authentification to proxy failed') self.on_failure('Authentification to proxy failed') return + log.info('Authentification successfull. Jabber server contacted.') # Request connection req = b'\x05\x01\x00' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0a116941254d652808a2ec954b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0a116941254d652808a2ec954b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Always reset state on reconnect
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac4bde04 by Philipp Hörist at 2019-05-15T18:12:41Z MAM: Always reset state on reconnect It was not reset if the previous MAM query was interrupted because of a disconnect - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/modules/mam.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1346,6 +1346,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._discover_server() self._set_send_timeouts() self.get_module('Chatstate').enabled = True + self.get_module('MAM').reset_state() def _set_send_timeouts(self): if app.config.get_per('accounts', self.name, 'keep_alives_enabled'): ===================================== gajim/common/modules/mam.py ===================================== @@ -68,6 +68,10 @@ class MAM(BaseModule): account=self._account, feature=self.archiving_namespace)) + def reset_state(self): + self._mam_query_ids.clear() + self._catch_up_finished.clear() + def _from_valid_archive(self, _stanza, properties): if properties.type.is_groupchat: expected_archive = properties.jid View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4bde0447a5553d6a2515a8eac664806c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4bde0447a5553d6a2515a8eac664806c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Settings: Determine activateable via func
by Philipp Hörist 09 May '19

09 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc5e7541 by Philipp Hörist at 2019-05-09T15:51:53Z Settings: Determine activateable via func - - - - - 03917eda by Philipp Hörist at 2019-05-09T15:54:33Z Fix pylint errors - - - - - 2 changed files: - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -21,7 +21,8 @@ from enum import unique Filter = namedtuple('Filter', 'name pattern default') -Setting = namedtuple('Setting', 'kind label type value name callback data desc enabledif props') +Setting = namedtuple('Setting', 'kind label type value name callback data desc ' + 'enabledif enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore @unique ===================================== gajim/gtk/settings.py ===================================== @@ -66,12 +66,12 @@ class SettingsDialog(Gtk.ApplicationWindow): self.listbox.connect('row-activated', self.on_row_activated) self.connect('key-press-event', self.on_key_press) - def on_key_press(self, widget, event): + def on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() @staticmethod - def on_row_activated(listbox, row): + def on_row_activated(_listbox, row): row.on_row_activated() def get_setting(self, name): @@ -143,7 +143,7 @@ class SettingsBox(Gtk.ListBox): class GenericSetting(Gtk.ListBoxRow): def __init__(self, account, label, type_, value, - name, callback, data, desc, enabledif): + name, callback, data, desc, enabledif, enabled_func): Gtk.ListBoxRow.__init__(self) self._grid = Gtk.Grid() self._grid.set_size_request(-1, 30) @@ -157,6 +157,7 @@ class GenericSetting(Gtk.ListBoxRow): self.account = account self.name = name self.enabledif = enabledif + self.enabled_func = enabled_func self.setting_value = self.get_value() description_box = Gtk.Box( @@ -208,7 +209,7 @@ class GenericSetting(Gtk.ListBoxRow): @staticmethod def __get_value(type_, value, account): if value is None: - return + return None if type_ == SettingType.VALUE: return value @@ -260,18 +261,23 @@ class GenericSetting(Gtk.ListBoxRow): raise NotImplementedError def update_activatable(self, name, value): - if self.enabledif is None or self.enabledif[0] != name: - return - activatable = (name, value) == self.enabledif - self.set_activatable(activatable) - self.set_sensitive(activatable) + enabled_func_value = True + if self.enabled_func is not None: + enabled_func_value = self.enabled_func() + + enabledif_value = True + if self.enabledif is not None and self.enabledif[0] == name: + enabledif_value = (name, value) == self.enabledif + + self.set_activatable(enabled_func_value and enabledif_value) + self.set_sensitive(enabled_func_value and enabledif_value) class SwitchSetting(GenericSetting): __gproperties__ = { "setting-value": (bool, 'Switch Value', '', False, - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -305,7 +311,7 @@ class EntrySetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Entry Value', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -336,7 +342,7 @@ class DialogSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, dialog): GenericSetting.__init__(self, *args) @@ -369,7 +375,7 @@ class SpinSetting(GenericSetting): __gproperties__ = { "setting-value": (int, 'Priority', '', -128, 127, 0, - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, range_): GenericSetting.__init__(self, *args) @@ -407,7 +413,7 @@ class FileChooserSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Certificate Path', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, filefilter): GenericSetting.__init__(self, *args) @@ -457,7 +463,7 @@ class CallbackSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, callback): GenericSetting.__init__(self, *args) @@ -472,7 +478,7 @@ class ActionSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, account): GenericSetting.__init__(self, *args) @@ -510,7 +516,7 @@ class ComboSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, combo_items): GenericSetting.__init__(self, *args) @@ -550,7 +556,7 @@ class ProxyComboSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b59d5434f2d922ea395eb81d486b87b3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b59d5434f2d922ea395eb81d486b87b3d… 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