copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check receipt (XEP-184) requests / answers only after stanza is decrypted

This commit is contained in:
Yann Leboulanger 2010-10-19 11:43:17 +02:00
parent 6700307846
commit 9ced743057
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/connection_handlers.py
View File

@ -1418,28 +1418,6 @@ ConnectionJingle, ConnectionIBBytestream):
self.dispatch('FAILED_DECRYPT', (obj.fjid, obj.timestamp, self.dispatch('FAILED_DECRYPT', (obj.fjid, obj.timestamp,
obj.session)) obj.session))
# Receipt requested
# TODO: We shouldn't answer if we're invisible!
contact = gajim.contacts.get_contact(self.name, obj.jid)
nick = obj.resource
gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick)
if obj.receipt_request_tag and gajim.config.get_per('accounts',
self.name, 'answer_receipts') and ((contact and contact.sub \
not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error':
receipt = common.xmpp.Message(to=obj.fjid, typ='chat')
receipt.setID(obj.id_)
receipt.setTag('received', namespace='urn:xmpp:receipts',
attrs={'id': obj.id_})
if obj.thread_id:
receipt.setThread(obj.thread_id)
self.connection.send(receipt)
# We got our message's receipt
if obj.receipt_received_tag and obj.session.control and \
gajim.config.get_per('accounts', self.name, 'request_receipt'):
obj.session.control.conv_textview.hide_xep0184_warning(obj.id_)
if obj.enc_tag and self.USE_GPG: if obj.enc_tag and self.USE_GPG:
encmsg = obj.enc_tag.getData() encmsg = obj.enc_tag.getData()
@ -1463,6 +1441,29 @@ ConnectionJingle, ConnectionIBBytestream):
def _nec_decrypted_message_received(self, obj): def _nec_decrypted_message_received(self, obj):
if obj.conn.name != self.name: if obj.conn.name != self.name:
return return
# Receipt requested
# TODO: We shouldn't answer if we're invisible!
contact = gajim.contacts.get_contact(self.name, obj.jid)
nick = obj.resource
gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick)
if obj.receipt_request_tag and gajim.config.get_per('accounts',
self.name, 'answer_receipts') and ((contact and contact.sub \
not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error':
receipt = common.xmpp.Message(to=obj.fjid, typ='chat')
receipt.setID(obj.id_)
receipt.setTag('received', namespace='urn:xmpp:receipts',
attrs={'id': obj.id_})
if obj.thread_id:
receipt.setThread(obj.thread_id)
self.connection.send(receipt)
# We got our message's receipt
if obj.receipt_received_tag and obj.session.control and \
gajim.config.get_per('accounts', self.name, 'request_receipt'):
obj.session.control.conv_textview.hide_xep0184_warning(obj.id_)
if obj.mtype == 'error': if obj.mtype == 'error':
self.dispatch_error_message(msg, msgtxt, session, frm, tim) self.dispatch_error_message(msg, msgtxt, session, frm, tim)
elif obj.mtype == 'groupchat': elif obj.mtype == 'groupchat':

10
src/common/connection_handlers_events.py
View File

@ -972,10 +972,6 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
if xep_200_encrypted: if xep_200_encrypted:
self.encrypted = 'xep200' self.encrypted = 'xep200'
self.receipt_request_tag = self.stanza.getTag('request',
namespace=xmpp.NS_RECEIPTS)
self.receipt_received_tag = self.stanza.getTag('received',
namespace=xmpp.NS_RECEIPTS)
return True return True
class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): class GcInvitationReceivedEvent(nec.NetworkIncomingEvent):
@ -1006,6 +1002,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent):
def generate(self): def generate(self):
self.stanza = self.msg_obj.stanza self.stanza = self.msg_obj.stanza
self.id_ = self.msg_obj.id_
self.jid = self.msg_obj.jid self.jid = self.msg_obj.jid
self.fjid = self.msg_obj.fjid self.fjid = self.msg_obj.fjid
self.resource = self.msg_obj.resource self.resource = self.msg_obj.resource
@ -1017,6 +1014,11 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent):
self.session = self.msg_obj.session self.session = self.msg_obj.session
self.timestamp = self.msg_obj.timestamp self.timestamp = self.msg_obj.timestamp
self.encrypted = self.msg_obj.encrypted self.encrypted = self.msg_obj.encrypted
self.receipt_request_tag = self.stanza.getTag('request',
namespace=xmpp.NS_RECEIPTS)
self.receipt_received_tag = self.stanza.getTag('received',
namespace=xmpp.NS_RECEIPTS)
return True return True
class GcMessageReceivedEvent(nec.NetworkIncomingEvent): class GcMessageReceivedEvent(nec.NetworkIncomingEvent):