Commits April 2017

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][gajim_0.16] 2 commits: Allow preferences window to shrink
by Philipp Hörist 10 Apr '17

10 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 36b147df by Stephen Paul Weber at 2017-04-09T20:32:08-05:00 Allow preferences window to shrink Previously, it would always be the size needed to fit the largest page from the notebook. This is death on small-screen devices like the pocketCHIP. Just adding a ScrolledWindow allows is to get smaller (at least vertically, which is the main issue). However, we want to still be a nice size on large screens. So, we ask each page in the notebook how tall it wishes to be, and default the window to the tallest one (plus the size of the extra controls). However, if the screen is shorter than this, we do not allow the default window size to exceed the screen size. Because of the large amount of re-indentation in the XML file, it is suggested to view this diff with `-b` - - - - - b5fabea5 by Philipp Hörist at 2017-04-10T16:42:48+02:00 Merge branch 'allow-smaller-preferences-window' into 'gajim_0.16' Allow preferences window to shrink See merge request !81 - - - - - 2 changed files: - data/gui/preferences_window.ui - src/config.py Changes: ===================================== data/gui/preferences_window.ui ===================================== The diff for this file was not included because it is too large. ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -115,6 +115,19 @@ class PreferencesWindow: 'auto_xa_time_spinbutton') self.auto_xa_message_entry = self.xml.get_object('auto_xa_message_entry') + ### Default Window Size ### + tallest = 0 + for n in range(0, self.notebook.get_n_pages()): + page = self.notebook.get_nth_page(n) + content = page.get_children()[0].get_children()[0] + width, height = content.size_request() + if height > tallest: + tallest = height + + wwidth, wheight = self.window.get_size() + tallest += wheight + self.window.set_default_size(-1, min(gtk.gdk.screen_height(), tallest)) + ### General tab ### # Display avatars in roster st = gajim.config.get('show_avatars_in_roster') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/755b9bed1bc6adc955d077de9c0d29671…

1 0

[Git][gajim/gajim][master] 6 commits: Pass EventObject around instead of many vars
by Philipp Hörist 08 Apr '17

08 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d344c24a by Philipp Hörist at 2017-04-04T21:30:48+02:00 Pass EventObject around instead of many vars This makes it much easier to read and modify - - - - - 28a3a58e by Philipp Hörist at 2017-04-04T21:31:00+02:00 Refactor encrypting PGP Message - Add a _encrypt_message() and _finished_encrypt() method - Handle Fallback body text in _on_continue_message() where we build the Stanza - - - - - caba5e17 by Philipp Hörist at 2017-04-04T21:55:16+02:00 Rename _on_continue_message() _build_message_stanza is a better fitting name - - - - - 298ba4d9 by Philipp Hörist at 2017-04-04T23:21:11+02:00 Fix Last Message Correction for PGP messages - - - - - bbb5c0f5 by Philipp Hörist at 2017-04-06T23:21:19+02:00 Simplify sending message - Dont use callbacks, they have no gain in that situation and make the code hard to read - pass the whole object to a new Event instead of many vars - - - - - 8a789763 by Philipp Hörist at 2017-04-08T18:38:55+02:00 Merge branch 'master' into 'master' Sending Message Refactoring See merge request !80 - - - - - 3 changed files: - src/common/connection.py - src/common/connection_handlers_events.py - src/common/zeroconf/connection_zeroconf.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -263,232 +263,202 @@ class CommonConnection: """ raise NotImplementedError - def _prepare_message(self, jid, msg, keyID, type_='chat', subject='', - chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, - session=None, forward_from=None, form_node=None, label=None, - original_message=None, delayed=None, attention=False, correction_msg=None, - callback=None): + def _prepare_message(self, obj): + if not self.connection or self.connected < 2: return 1 - if isinstance(jid, list): - new_list = [] - for j in jid: + if isinstance(obj.jid, list): + for jid in obj.jid: try: - new_list.append(self.check_jid(j)) + self.check_jid(jid) except helpers.InvalidFormat: gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Invalid JID'), sec_txt=_('It is not possible to send a message ' - 'to %s, this JID is not valid.') % j)) + 'to %s, this JID is not valid.') % jid)) return - fjid = new_list else: try: - jid = self.check_jid(jid) + self.check_jid(obj.jid) except helpers.InvalidFormat: gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Invalid JID'), sec_txt=_( 'It is not possible to send a message to %s, this JID is not ' - 'valid.') % jid)) + 'valid.') % obj.jid)) return - fjid = jid - if resource: - fjid += '/' + resource - - if session: - fjid = session.get_to() - if msg and not xhtml and gajim.config.get( + if obj.message and not obj.xhtml and gajim.config.get( 'rst_formatting_outgoing_messages'): from common.rst_xhtml_generator import create_xhtml - xhtml = create_xhtml(msg) - if not msg and chatstate is None and form_node is None: + obj.xhtml = create_xhtml(obj.message) + if not obj.message and obj.chatstate is None and obj.form_node is None: return - msgtxt = msg - msgenc = '' + if obj.keyID and self.USE_GPG: + self._encrypt_message(obj) + return - if keyID and self.USE_GPG: - xhtml = None - if keyID == 'UNKNOWN': - error = _('Neither the remote presence is signed, nor a key was ' - 'assigned.') - elif keyID.endswith('MISMATCH'): - error = _('The contact\'s key (%s) does not match the key assigned ' - 'in Gajim.' % keyID[:8]) - else: - myKeyID = gajim.config.get_per('accounts', self.name, 'keyid') - def encrypt_thread(msg, keyID, always_trust=False): - # encrypt message. This function returns (msgenc, error) - return self.gpg.encrypt(msg, [keyID, myKeyID], - always_trust) - def _on_encrypted(output): - msgenc, error = output - if error.startswith( 'NOT_TRUSTED'): - def _on_always_trust(answer): - if answer: - gajim.thread_interface(encrypt_thread, [msg, keyID, - True], _on_encrypted, []) - else: - self._message_encrypted_cb(output, type_, msg, - msgtxt, original_message, fjid, resource, - jid, xhtml, subject, chatstate, msg_id, - label, forward_from, delayed, session, - form_node, user_nick, keyID, attention, - correction_msg, callback) - gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, - conn=self, keyID=error.split(' ')[-1], - callback=_on_always_trust)) - else: - self._message_encrypted_cb(output, type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, - subject, chatstate, msg_id, label, forward_from, - delayed, session, form_node, user_nick, keyID, - attention, correction_msg, callback) - gajim.thread_interface(encrypt_thread, [msg, keyID, False], - _on_encrypted, []) - return + self._build_message_stanza(obj) - self._message_encrypted_cb(('', error), type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, subject, - chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, keyID, attention, correction_msg, - callback) + def _encrypt_message(self, obj): + obj.xhtml = None + if obj.keyID == 'UNKNOWN': + error = _('Neither the remote presence is signed, nor a key was ' + 'assigned.') + elif obj.keyID.endswith('MISMATCH'): + error = _('The contact\'s key (%s) does not match the key assigned ' + 'in Gajim.' % obj.keyID[:8]) + else: + myKeyID = gajim.config.get_per('accounts', self.name, 'keyid') + key_list = [obj.keyID, myKeyID] + def _on_encrypted(output): + msgenc, error = output + if error.startswith('NOT_TRUSTED'): + def _on_always_trust(answer): + if answer: + gajim.thread_interface( + self.gpg.encrypt, [obj.message, key_list, True], + _on_encrypted, []) + else: + self._finished_encrypt(obj, msgenc=msgenc, + error=error) + gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, + conn=self, keyID=error.split(' ')[-1], + callback=_on_always_trust)) + else: + self._finished_encrypt(obj, msgenc=msgenc, error=error) + gajim.thread_interface( + self.gpg.encrypt, [obj.message, key_list, False], + _on_encrypted, []) return + self._finished_encrypt(obj, error=error) - self._on_continue_message(type_, msg, msgtxt, original_message, fjid, - resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, - label, forward_from, delayed, session, form_node, user_nick, - attention, correction_msg, callback) - - def _message_encrypted_cb(self, output, type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, - label, forward_from, delayed, session, form_node, user_nick, keyID, - attention, correction_msg, callback): - msgenc, error = output + def _finished_encrypt(self, obj, msgenc=None, error=None): + if error: + gajim.nec.push_incoming_event( + MessageNotSentEvent( + None, conn=self, jid=obj.jid, message=obj.message, + error=error, time_=time.time(), session=obj.session)) + return + self._build_message_stanza(obj, msgenc) - if msgenc and not error: + def _build_message_stanza(self, obj, msgenc=None): + if msgenc: msgtxt = '[This message is *encrypted* (See :XEP:`27`]' lang = os.getenv('LANG') if lang is not None and not lang.startswith('en'): # we're not english: one in locale and one en msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \ ' (' + msgtxt + ')' - self._on_continue_message(type_, msg, msgtxt, original_message, - fjid, resource, jid, xhtml, subject, msgenc, keyID, - chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, attention, correction_msg, callback) - return - # Encryption failed, do not send message - tim = time.localtime() - gajim.nec.push_incoming_event(MessageNotSentEvent(None, conn=self, - jid=jid, message=msgtxt, error=error, time_=tim, session=session)) - - def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid, - resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, - label, forward_from, delayed, session, form_node, user_nick, attention, - correction_msg, callback): - - if correction_msg: - id_ = correction_msg.getID() - if correction_msg.getTag('replace'): - correction_msg.delChild('replace') - correction_msg.setTag('replace', attrs={'id': id_}, + else: + msgtxt = obj.message + + fjid = obj.get_full_jid() + + if obj.correction_msg: + id_ = obj.correction_msg.getID() + if obj.correction_msg.getTag('replace'): + obj.correction_msg.delChild('replace') + obj.correction_msg.setTag('replace', attrs={'id': id_}, namespace=nbxmpp.NS_CORRECT) id2 = self.connection.getAnID() - correction_msg.setID(id2) - correction_msg.setBody(msgtxt) - if xhtml: - correction_msg.setXHTML(xhtml) + obj.correction_msg.setID(id2) + obj.correction_msg.setBody(msgtxt) + if obj.xhtml: + obj.correction_msg.setXHTML(obj.xhtml) + + if msgenc: + encrypted_tag = obj.correction_msg.getTag( + 'x', namespace=nbxmpp.NS_ENCRYPTED) + obj.correction_msg.delChild(encrypted_tag) + obj.correction_msg.setTag( + 'x', namespace=nbxmpp.NS_ENCRYPTED).setData(msgenc) - if session: - session.last_send = time.time() + if obj.session: + obj.session.last_send = time.time() # XEP-0200 - if session.enable_encryption: - correction_msg = session.encrypt_stanza(correction_msg) + if obj.session.enable_encryption: + obj.correction_msg = obj.session.encrypt_stanza(obj.correction_msg) - if callback: - callback(jid, msg, keyID, forward_from, session, original_message, - subject, type_, correction_msg, xhtml) + self._push_stanza_message_outgoing(obj, obj.correction_msg) return - - if type_ == 'chat': - msg_iq = nbxmpp.Message(body=msgtxt, typ=type_, - xhtml=xhtml) + if obj.type_ == 'chat': + msg_iq = nbxmpp.Message(body=msgtxt, typ=obj.type_, + xhtml=obj.xhtml) else: - if subject: + if obj.subject: msg_iq = nbxmpp.Message(body=msgtxt, typ='normal', - subject=subject, xhtml=xhtml) + subject=obj.subject, xhtml=obj.xhtml) else: msg_iq = nbxmpp.Message(body=msgtxt, typ='normal', - xhtml=xhtml) + xhtml=obj.xhtml) - if msg_id: - msg_iq.setID(msg_id) + if obj.msg_id: + msg_iq.setID(obj.msg_id) if msgenc: - msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) + msg_iq.setTag('x', namespace=nbxmpp.NS_ENCRYPTED).setData(msgenc) - if form_node: - msg_iq.addChild(node=form_node) - if label: - msg_iq.addChild(node=label) + if obj.form_node: + msg_iq.addChild(node=obj.form_node) + if obj.label: + msg_iq.addChild(node=obj.label) # XEP-0172: user_nickname - if user_nick: - msg_iq.setTag('nick', namespace = nbxmpp.NS_NICK).setData( - user_nick) + if obj.user_nick: + msg_iq.setTag('nick', namespace=nbxmpp.NS_NICK).setData( + obj.user_nick) # XEP-0203 - if delayed: + if obj.delayed: our_jid = gajim.get_jid_from_account(self.name) + '/' + \ self.server_resource - timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(delayed)) + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(obj.delayed)) msg_iq.addChild('delay', namespace=nbxmpp.NS_DELAY2, attrs={'from': our_jid, 'stamp': timestamp}) # XEP-0224 - if attention: + if obj.attention: msg_iq.setTag('attention', namespace=nbxmpp.NS_ATTENTION) - if isinstance(jid, list): + if isinstance(obj.jid, list): if self.addressing_supported: msg_iq.setTo(gajim.config.get_per('accounts', self.name, 'hostname')) addresses = msg_iq.addChild('addresses', namespace=nbxmpp.NS_ADDRESS) - for j in jid: + for j in obj.jid: addresses.addChild('address', attrs = {'type': 'to', 'jid': j}) else: iqs = [] - for j in jid: + for j in obj.jid: iq = nbxmpp.Message(node=msg_iq) iq.setTo(j) iqs.append(iq) msg_iq = iqs else: msg_iq.setTo(fjid) - r_ = resource - if not r_ and jid != fjid: # Only if we're not in a pm + r_ = obj.resource + if not r_ and obj.jid != fjid: # Only if we're not in a pm r_ = gajim.get_resource_from_jid(fjid) if r_: - contact = gajim.contacts.get_contact(self.name, jid, r_) + contact = gajim.contacts.get_contact(self.name, obj.jid, r_) else: contact = gajim.contacts.get_contact_with_highest_priority( - self.name, jid) + self.name, obj.jid) # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event - if chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): - msg_iq.setTag(chatstate, namespace=nbxmpp.NS_CHATSTATES) + if obj.chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): + msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) only_chatste = False if not msgtxt: only_chatste = True - if only_chatste and not session.enable_encryption: + if only_chatste and not obj.session.enable_encryption: msg_iq.setTag('no-store', namespace=nbxmpp.NS_MSG_HINTS) @@ -498,20 +468,20 @@ class CommonConnection: nbxmpp.NS_RECEIPTS): msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) - if forward_from: + if obj.forward_from: addresses = msg_iq.addChild('addresses', namespace=nbxmpp.NS_ADDRESS) addresses.addChild('address', attrs = {'type': 'ofrom', - 'jid': forward_from}) + 'jid': obj.forward_from}) - if session: + if obj.session: # XEP-0201 - session.last_send = time.time() - msg_iq.setThread(session.thread_id) + obj.session.last_send = time.time() + msg_iq.setThread(obj.session.thread_id) # XEP-0200 - if session.enable_encryption: - msg_iq = session.encrypt_stanza(msg_iq) + if obj.session.enable_encryption: + msg_iq = obj.session.encrypt_stanza(msg_iq) if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) @@ -523,9 +493,19 @@ class CommonConnection: msg_iq.addChild(name='no-store', namespace=nbxmpp.NS_MSG_HINTS) - if callback: - callback(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq, xhtml) + self._push_stanza_message_outgoing(obj, msg_iq) + + def _push_stanza_message_outgoing(self, obj, msg_iq): + obj.conn = self + if isinstance(msg_iq, list): + for iq in msg_iq: + obj.msg_iq = iq + gajim.nec.push_incoming_event( + StanzaMessageOutgoingEvent(None, **vars(obj))) + else: + obj.msg_iq = msg_iq + gajim.nec.push_incoming_event( + StanzaMessageOutgoingEvent(None, **vars(obj))) def log_message(self, jid, msg, forward_from, session, original_message, subject, type_, xhtml=None, additional_data=None): @@ -2142,58 +2122,35 @@ class Connection(CommonConnection, ConnectionHandlers): if obj.account != self.name: return - # parameters of this function are packet into _cb_parameters for later usage in _nec_stanza_message_outgoing's cb() - def cb(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq, xhtml): - if isinstance(msg_iq, list): - for iq in msg_iq: - gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent( - None, conn=self, msg_iq=iq, now=obj.now, automatic_message=obj.automatic_message, additional_data=obj.additional_data, - _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, - "session":session, "original_message":original_message, "subject":subject, "type_":type_, - "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) - else: - gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent(None, - conn=self, msg_iq=msg_iq, now=obj.now, automatic_message=obj.automatic_message, additional_data=obj.additional_data, - _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, - "session":session, "original_message":original_message, "subject":subject, "type_":type_, - "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) - - self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, - subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, - resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, - label=obj.label, session=obj.session, forward_from=obj.forward_from, - form_node=obj.form_node, original_message=obj.original_message, - delayed=obj.delayed, attention=obj.attention, - correction_msg=obj.correction_msg, callback=cb) + self._prepare_message(obj) def _nec_stanza_message_outgoing(self, obj): if obj.conn.name != self.name: return obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) - # obj in this function is the obj as seen in _nec_message_outgoing() - def cb(obj, jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq, xhtml, msg_id): - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate, - automatic_message=obj.automatic_message, msg_id=msg_id, additional_data=obj.additional_data)) - if obj.callback: - obj.callback(obj, msg_iq, *obj.callback_args) - - if not obj.is_loggable: - return - if isinstance(jid, list): - for j in jid: - if session is None: - session = self.get_or_create_session(j, '') - self.log_message(j, msg, forward_from, session, - original_message, subject, type_, xhtml, obj.additional_data) - else: - self.log_message(jid, msg, forward_from, session, - original_message, subject, type_, xhtml, obj.additional_data) - - cb(msg_id=obj.msg_id, **obj._cb_parameters) + gajim.nec.push_incoming_event(MessageSentEvent( + None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, + chatstate=obj.chatstate, automatic_message=obj.automatic_message, + msg_id=obj.msg_id, additional_data=obj.additional_data)) + if obj.callback: + obj.callback(obj, obj.msg_iq, *obj.callback_args) + + if not obj.is_loggable: + return + if isinstance(obj.jid, list): + for j in obj.jid: + if obj.session is None: + obj.session = self.get_or_create_session(j, '') + self.log_message( + j, obj.message, obj.forward_from, obj.session, + obj.original_message, obj.subject, obj.type_, obj.xhtml, + obj.additional_data) + else: + self.log_message( + obj.jid, obj.message, obj.forward_from, obj.session, + obj.original_message, obj.subject, obj.type_, obj.xhtml, + obj.additional_data) def send_contacts(self, contacts, fjid, type_='message'): """ ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -2749,6 +2749,13 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.correction_msg = None self.automatic_message = True + def get_full_jid(self): + if self.resource: + return self.jid + '/' + self.resource + if self.session: + return self.session.get_to() + return self.jid + def generate(self): return True ===================================== src/common/zeroconf/connection_zeroconf.py ===================================== --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -64,8 +64,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): CommonConnection.__init__(self, name) self.is_zeroconf = True - gajim.ged.register_event_handler('message-outgoing', ged.OUT_CORE, - self._nec_message_outgoing) + gajim.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, + self._nec_stanza_message_outgoing) def get_config_values_or_default(self): """ @@ -332,47 +332,37 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): title=_('Could not change status of account "%s"') % self.name, msg=_('Please check if avahi-daemon is running.'))) - def _nec_message_outgoing(self, obj): - if obj.account != self.name: - return + def _nec_stanza_message_outgoing(self, obj): - def cb(jid, msg, keyID, forward_from, session, original_message, subject, - type_, msg_iq, xhtml): - def on_send_ok(msg_id): - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=obj.keyID, - automatic_message=obj.automatic_message, chatstate=None, - msg_id=msg_id)) - if obj.callback: - obj.callback(msg_iq, *obj.callback_args) - - if not obj.is_loggable: - return - self.log_message(obj.jid, obj.message, obj.forward_from, - obj.session, obj.original_message, obj.subject, obj.type_) - - def on_send_not_ok(reason): - reason += ' ' + _('Your message could not be sent.') - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, - time_=None, session=obj.session)) - - ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok, - on_not_ok=on_send_not_ok) - - if ret == -1: - # Contact Offline - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=jid, error_code=-1, error_msg=_( - 'Contact is offline. Your message could not be sent.'), - msg=None, time_=None, session=session)) - - self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, - subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, - resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, - label=obj.label, session=obj.session, forward_from=obj.forward_from, - form_node=obj.form_node, original_message=obj.original_message, - delayed=obj.delayed, attention=obj.attention, callback=cb) + def on_send_ok(msg_id): + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=obj.keyID, + automatic_message=obj.automatic_message, chatstate=None, + msg_id=msg_id)) + if obj.callback: + obj.callback(obj.msg_iq, *obj.callback_args) + + if not obj.is_loggable: + return + self.log_message(obj.jid, obj.message, obj.forward_from, + obj.session, obj.original_message, obj.subject, obj.type_) + + def on_send_not_ok(reason): + reason += ' ' + _('Your message could not be sent.') + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, + time_=None, session=obj.session)) + + ret = self.connection.send( + obj.msg_iq, obj.message is not None, + on_ok=on_send_ok, on_not_ok=on_send_not_ok) + + if ret == -1: + # Contact Offline + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=obj.jid, error_code=-1, error_msg=_( + 'Contact is offline. Your message could not be sent.'), + msg=None, time_=None, session=obj.session)) def send_stanza(self, stanza): # send a stanza untouched View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1a5d6fbf30d7a82afd6eba2ad6aad5f69…

1 0

[Git][gajim/gajim][gajim_0.16] 10 commits: Allow IBB FT to bare JIDs
by Philipp Hörist 03 Apr '17

03 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 9279a76b by Philipp Hörist at 2017-03-29T19:14:04+02:00 Allow IBB FT to bare JIDs - - - - - ba2010da by Philipp Hörist at 2017-03-30T04:11:23+02:00 Close IBB Stream correctly - - - - - 88da5dee by Philipp Hörist at 2017-03-30T04:11:40+02:00 Read/Write file in binary mode - - - - - dc38753a by Philipp Hörist at 2017-03-30T04:11:40+02:00 Dont hash file on filetransfer error - - - - - 4a814c3f by Philipp Hörist at 2017-03-30T04:11:41+02:00 Fix typo in event type - - - - - e3b40633 by Philipp Hörist at 2017-03-30T04:11:41+02:00 Only make pause button active on pause-able transfers - - - - - d121dc31 by Philipp Hörist at 2017-03-30T04:11:42+02:00 On IBB cancel set correct 'to' attr - - - - - 450160a1 by Philipp Hörist at 2017-03-30T04:11:42+02:00 Refactor IBB Handlers - Move handling of Data IQs into IBBIqHandler - Call SendHandler with file_props - Save last sent id in file_props.syn_id - Remove some useless checks, now that we call SendHandler with file_props - Send item-not-found error on invalid session id - - - - - 7b673eaf by Philipp Hörist at 2017-03-30T12:50:35+02:00 Remove not working proxys - - - - - 755b9bed by Philipp Hörist at 2017-04-03T17:20:05+02:00 Merge branch 'fixjingle' into 'gajim_0.16' Fix IBB See merge request !76 - - - - - 6 changed files: - src/common/config.py - src/common/events.py - src/common/jingle_ftstates.py - src/common/protocol/bytestream.py - src/filetransfers_window.py - src/gui_interface.py Changes: ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -377,7 +377,7 @@ class Config: 'http_auth': [opt_str, 'ask'], # yes, no, ask 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT - 'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'], + 'file_transfer_proxies': [opt_str, ''], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide ===================================== src/common/events.py ===================================== --- a/src/common/events.py +++ b/src/common/events.py @@ -162,7 +162,7 @@ class FileStoppedEvent(FileRequestEvent): type_ = 'file-stopped' class FileHashErrorEvent(FileRequestEvent): - type_ = 'file-hash-rror' + type_ = 'file-hash-error' class JingleIncomingEvent(Event): type_ = 'jingle-incoming' ===================================== src/common/jingle_ftstates.py ===================================== --- a/src/common/jingle_ftstates.py +++ b/src/common/jingle_ftstates.py @@ -141,7 +141,7 @@ 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, 'r') + fp = open(self.jft.file_props.file_name, 'rb') con.OpenStream( self.jft.file_props.sid, self.jft.session.peerjid, fp, blocksize=4096) ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -251,7 +251,7 @@ class ConnectionBytestream: if field.getValue() == nbxmpp.NS_IBB: sid = file_props.sid file_props.transport_sid = sid - fp = open(file_props.file_name, 'r') + fp = open(file_props.file_name, 'rb') self.OpenStream(sid, file_props.receiver, fp) raise nbxmpp.NodeProcessed @@ -753,7 +753,6 @@ class ConnectionIBBytestream(ConnectionBytestream): def __init__(self): ConnectionBytestream.__init__(self) self._streams = {} - self.last_sent_ibb_id = None def IBBIqHandler(self, conn, stanza): """ @@ -761,12 +760,22 @@ class ConnectionIBBytestream(ConnectionBytestream): """ typ = stanza.getType() log.debug('IBBIqHandler called typ->%s' % typ) - if typ == 'set' and stanza.getTag('open', namespace=nbxmpp.NS_IBB): + if typ == 'set' and stanza.getTag('open'): self.StreamOpenHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('close', namespace=nbxmpp.NS_IBB): + elif typ == 'set' and stanza.getTag('close'): self.StreamCloseHandler(conn, stanza) - elif typ == 'result': - self.SendHandler() + 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': gajim.socks5queue.error_cb('Error', stanza.getErrorMsg()) else: @@ -809,18 +818,23 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props.disconnect_cb = None file_props.continue_cb = None file_props.syn_id = stanza.getID() - file_props.fp = open(file_props.file_name, 'w') + 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 - self.connection.send(nbxmpp.Protocol('iq', - file_props.direction[1:], 'set', + 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.session_type == 'jingle': + if file_props.completed: + gajim.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') @@ -837,10 +851,8 @@ class ConnectionIBBytestream(ConnectionBytestream): Take into account that recommended stanza size is 4k and IBB uses base64 encoding that increases size of data by 1/3. """ - if not nbxmpp.JID(to).getResource(): - return file_props = FilesProp.getFilePropBySid(sid) - file_props.direction = '|>' + to + file_props.direction = '>' file_props.block_size = blocksize file_props.fp = fp file_props.seq = 0 @@ -859,60 +871,40 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props.syn_id = syn.getID() return file_props - def SendHandler(self): + def SendHandler(self, file_props): """ Send next portion of data if it is time to do it. Used internally. """ log.debug('SendHandler called') - for file_props in FilesProp.getAllFileProp(): - if not file_props.direction: - # it's socks5 bytestream - continue - if file_props.completed: - continue - sid = file_props.sid - if file_props.direction[:2] == '|>': - # We waitthat other part accept stream - continue - if file_props.direction[0] == '>': - if file_props.paused: - continue - if not file_props.connected: - #TODO: Reply with out of order error - continue - 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.encodestring(chunk)) - file_props.seq += 1 - file_props.started = True - if file_props.seq == 65536: - file_props.seq = 0 - self.last_sent_ibb_id = self.connection.send( - nbxmpp.Protocol(name='iq', to=file_props.direction[1:], - 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) - gajim.socks5queue.progress_transfer_cb(self.name, - file_props) - if file_props.completed: # set in progress_transfer_cd() - # notify the other side about stream closing - self.connection.send(nbxmpp.Protocol('iq', - file_props.direction[1:], 'set', - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid': file_props.transport_sid})])) - else: - # notify the other side about stream closing - # notify the local user about sucessfull send - # delete the local stream - self.connection.send(nbxmpp.Protocol('iq', - file_props.direction[1:], 'set', - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid': file_props.transport_sid})])) - file_props.completed = True + 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.encodestring(chunk)) + 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 + gajim.socks5queue.progress_transfer_cb(self.name, + file_props) + else: + log.debug('Nothing to read, but file not completed') def IBBMessageHandler(self, conn, stanza): """ @@ -981,6 +973,7 @@ class ConnectionIBBytestream(ConnectionBytestream): 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 @@ -1002,25 +995,9 @@ class ConnectionIBBytestream(ConnectionBytestream): else: conn.Event('IBB', 'ERROR ON SEND', file_props) elif stanza.getType() == 'result': - if file_props.direction[0] == '|': - file_props.direction = file_props.direction[1:] - self.SendHandler() - else: - conn.send(nbxmpp.Error(stanza, - nbxmpp.ERR_UNEXPECTED_REQUEST)) + self.SendHandler(file_props) break - else: - if stanza.getTag('data'): - sid = stanza.getTagAttr('data', 'sid') - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props.connected and self.IBBMessageHandler(conn, - stanza): - reply = stanza.buildReply('result') - reply.delChild('data') - conn.send(reply) - raise nbxmpp.NodeProcessed - elif syn_id == self.last_sent_ibb_id: - self.SendHandler() + class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -64,8 +64,7 @@ class FileTransfersWindow: 'notify_ft_complete_checkbox') shall_notify = gajim.config.get('notify_on_file_complete') - self.notify_ft_checkbox.set_active(shall_notify - ) + self.notify_ft_checkbox.set_active(shall_notify) self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, int, str) self.tree.set_model(self.model) @@ -835,7 +834,7 @@ class FileTransfersWindow: if not is_row_selected: # no selection, disable the buttons self.set_all_insensitive() - elif not is_stopped: + elif not is_stopped and file_props.continue_cb: if is_transfer_active(file_props): # file transfer is active self.toggle_pause_continue(True) ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -1012,7 +1012,7 @@ class Interface: if file_props.type_ == 'r': # we receive a file gajim.socks5queue.remove_receiver(file_props.sid, True, True) if file_props.session_type == 'jingle': - if file_props.hash_: + if file_props.hash_ and file_props.error == 0: # We compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props)) @@ -1021,7 +1021,8 @@ class Interface: # We disn't get the hash, sender probably don't support that jid = unicode(file_props.sender) self.popup_ft_result(account, jid, file_props) - ft.set_status(file_props, 'ok') + if file_props.error == 0: + ft.set_status(file_props, 'ok') session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props.sid) # End jingle session View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c799f182fbf165de19e568b1ed0a8fe32…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Handle MUC-PM Sent-Carbons correctly
by Philipp Hörist 02 Apr '17

02 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 0296e863 by Philipp Hörist at 2017-03-31T22:19:20+02:00 Handle MUC-PM Sent-Carbons correctly Previously they were shown as 'incoming', when they should correctly show as 'outgoing' - - - - - cf3049f0 by Philipp Hörist at 2017-03-31T22:22:20+02:00 Dont notify on MUC-PM Sent-Carbons Additionally remove all previous Events if we receive a Sent-Carbon, because we know the user answered from another device - - - - - c799f182 by Philipp Hörist at 2017-04-02T21:54:14+02:00 Merge branch 'mucpm' into 'gajim_0.16' Improve carbon handling of MUC-PM messages See merge request !78 - - - - - 1 changed file: - src/groupchat_control.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1074,12 +1074,24 @@ class GroupchatControl(ChatControlBase): correct_id=(obj.stanza.getID(), None)) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) - def on_private_message(self, nick, msg, tim, xhtml, session, msg_log_id=None, - encrypted=False, displaymarking=None): + def on_private_message(self, nick, msg, tim, xhtml, session, sent_forwarded, + msg_log_id=None, encrypted=False, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 + if sent_forwarded: + ''' + We remove all muc-pm events for that jid because the + Message was answered from one of our other devices + ''' + gajim.events.remove_events(self.account, fjid, types=['pm']) + if self.parent_win: + self.parent_win.show_title() + self.parent_win.redraw_tab(self) + self.update_ui() + return + event = events.PmEvent(msg, '', 'incoming', tim, encrypted, '', msg_log_id, xhtml=xhtml, session=session, form_node=None, displaymarking=displaymarking, sent_forwarded=False) @@ -1365,16 +1377,21 @@ class GroupchatControl(ChatControlBase): if obj.gc_control == self and obj.resource: # We got a pm from this room nick = obj.resource + typ = '' + sent_forwarded = False + if obj.forwarded and obj.sent: + typ = 'out' + sent_forwarded = True if obj.session.control: # print if a control is open - obj.session.control.print_conversation(obj.msgtxt, + obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, displaymarking=obj.displaymarking, correct_id=(obj.id_, obj.correct_id)) else: # otherwise pass it off to the control to be queued self.on_private_message(nick, obj.msgtxt, obj.timestamp, - obj.xhtml, self.session, msg_log_id=obj.msg_log_id, + obj.xhtml, self.session, sent_forwarded, msg_log_id=obj.msg_log_id, encrypted=obj.encrypted, displaymarking=obj.displaymarking) def _nec_ping_reply(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d826d9402b887bb0b8d06d0e493a483ad…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2017