[commit-gajim] r8502 - branches/e2e_encryption/src/common - Commits

17 Aug 2007

Author: bct
Date: 2007-08-17 19:26:05 +0200 (Fri, 17 Aug 2007)
New Revision: 8502
Modified:
   branches/e2e_encryption/src/common/connection_handlers.py
Log:
notify on begin/end encryption
Modified: branches/e2e_encryption/src/common/connection_handlers.py
===================================================================

--- branches/e2e_encryption/src/common/connection_handlers.py	2007-08-17 09:02:53 UTC (rev 8501)
+++ branches/e2e_encryption/src/common/connection_handlers.py	2007-08-17 17:26:05 UTC (rev 8502)
@@ -1450,8 +1450,11 @@
    	if msg.getTag('init') and msg.getTag('init').namespace == 'http://www.xmpp.org/extensions/xep-0116.html#ns-init':
    		self._InitE2ECB(con, msg, session)
    	
+		encrypted = False
+
    	e2eTag = msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO)
    	if e2eTag:
+			encrypted = True
    		msg = session.decrypt_stanza(msg)
msgtxt = msg.getBody()
@@ -1461,7 +1464,6 @@
    	tim = time.strptime(tim, '%Y%m%dT%H:%M:%S')
    	tim = time.localtime(timegm(tim))
    	jid = helpers.get_jid_from_iq(msg)
-		encrypted = False
    	chatstate = None
    	encTag = msg.getTag('x', namespace = common.xmpp.NS_ENCRYPTED)
    	decmsg = ''

    