realtime notification of esession begin/end

src/chat_control.py

@@ -1057,10 +1057,7 @@ class ChatControl(ChatControlBase):
 		if self.contact.jid in gajim.encrypted_chats[self.account]:
 			self.xml.get_widget('gpg_togglebutton').set_active(True)
 
-		self.session = session
+		self.set_session(session)
-
-		# does this window have an existing, active esession?
-		self.esessioned = False
 
 		self.status_tooltip = gtk.Tooltips()
 		self.update_ui()
@@ -1467,6 +1464,23 @@ class ChatControl(ChatControlBase):
 		self.mouse_over_in_last_30_secs = False
 		self.kbd_activity_in_last_30_secs = False
 
+
+	# print esession settings to textview
+	def print_esession_details(self):
+		if self.session and self.session.enable_encryption:
+			msg = _('E2E encryption enabled')
+			ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+
+			if self.session.loggable:
+				msg = _('Session WILL be logged')
+			else:
+				msg = _('Session WILL NOT be logged')
+
+			ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+		else:
+			msg = _('E2E encryption disabled')
+			ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+
 	def print_conversation(self, text, frm = '', tim = None,
 		encrypted = False, subject = None, xhtml = None):
 		'''Print a line in the conversation:
@@ -1486,41 +1500,21 @@ class ChatControl(ChatControlBase):
 			kind = 'info'
 			name = ''
 		else:
-			# ESessions
 			if self.session and self.session.enable_encryption:
-				if not self.esessioned:
+				if not encrypted:
-					msg = _('Encryption enabled')
-					ChatControlBase.print_conversation_line(self, msg, 
-						'status', '', tim)
-
-					if self.session.loggable:
-						msg = _('Session WILL be logged')
-					else:
-						msg = _('Session WILL NOT be logged')
-
-					ChatControlBase.print_conversation_line(self, msg, 
-						'status', '', tim)
-
-					self.esessioned = True
-				elif not encrypted:
 					msg = _('The following message was NOT encrypted')
 					ChatControlBase.print_conversation_line(self, msg, 
 						'status', '', tim)
-			elif self.esessioned:
-				msg = _('Encryption disabled')
-				ChatControlBase.print_conversation_line(self, msg, 
-					'status', '', tim)
-				self.esessioned = False
 			else:
 				# GPG encryption
 				ec = gajim.encrypted_chats[self.account]
 				if encrypted and jid not in ec:
-					msg = _('Encryption enabled')
+					msg = _('OpenPGP Encryption enabled')
 					ChatControlBase.print_conversation_line(self, msg, 
 						'status', '', tim)
 					ec.append(jid)
 				elif not encrypted and jid in ec:
-					msg = _('Encryption disabled')
+					msg = _('OpenPGP Encryption disabled')
 					ChatControlBase.print_conversation_line(self, msg,
 						'status', '', tim)
 					ec.remove(jid)
@@ -2003,12 +1997,16 @@ class ChatControl(ChatControlBase):
 
 	def read_queue(self):
 		'''read queue and print messages containted in it'''
+
 		jid = self.contact.jid
 		jid_with_resource = jid
 		if self.resource:
 			jid_with_resource += '/' + self.resource
 		events = gajim.events.get_events(self.account, jid_with_resource)
 
+		if hasattr(self, 'session') and self.session and self.session.enable_encryption:
+			self.print_esession_details()
+
 		# Is it a pm ?
 		is_pm = False
 		room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
@@ -2169,18 +2167,18 @@ class ChatControl(ChatControlBase):
 			msg = _('Encryption disabled')
 			ChatControlBase.print_conversation_line(self, msg, 
 				'status', '', None)
-			self.esessioned = False
 
 			jid = str(self.session.jid)
 
 			gajim.connections[self.account].delete_session(jid,
 				self.session.thread_id)
 
-			self.session = gajim.connections[self.account].make_new_session(jid)
+			self.set_session(gajim.connections[self.account].make_new_session(jid))
 		else:
 			if not self.session:
-				self.session = gajim.connections[self.account].make_new_session(
+				fjid = self.contact.get_full_jid()
-					self.contact.jid)
+				new_sess = gajim.connections[self.account].make_new_session(fjid)
+				self.set_session(new_sess)
 
 			# XXX decide whether to use 4 or 3 message negotiation
 			self.session.negotiate_e2e(False)

src/common/stanza_session.py

@@ -71,7 +71,9 @@ class StanzaSession(object):
 	def cancelled_negotiation(self):
 		'''A negotiation has been cancelled, so reset this session to its default state.'''
 
-		# XXX notify the user	
+		if hasattr(self, 'control'):
+			msg = _('Session negotiation cancelled')
+			self.control.print_conversation_line(self, msg, 'status', '', None)
 
 		self.status = None
 		self.negotiated = {}
@@ -92,7 +94,7 @@ class StanzaSession(object):
 		self.status = None
 
 	def acknowledge_termination(self):
-		# we could send an acknowledgement message here, but we won't.
+		# we could send an acknowledgement message to the remote client here
 		self.status = None
 
 if gajim.HAVE_PYCRYPTO:
@@ -767,6 +769,9 @@ class EncryptedStanzaSession(StanzaSession):
 		self.status = 'active'
 		self.enable_encryption = True
 
+		if hasattr(self, 'control'):
+			self.control.print_esession_details()
+
 	def final_steps_alice(self, form):
 		srs = ''
 		srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped())
@@ -800,6 +805,9 @@ class EncryptedStanzaSession(StanzaSession):
 		self.status = 'active'
 		self.enable_encryption = True
 
+		if hasattr(self, 'control'):
+			self.control.print_esession_details()
+
 	# calculate and store the new retained secret
 	# prompt the user to check the remote party's identity (if necessary)
 	def do_retained_secret(self, k, srs):

src/gajim.py

@@ -2031,7 +2031,8 @@ class Interface:
 				ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account)
 
 				if ctrl:
-					ctrl.session = gajim.connections[account].make_new_session(str(jid))
+					new_sess = gajim.connections[account].make_new_session(str(jid))
+					ctrl.set_session(new_sess)
 
 				return
 
@@ -2044,7 +2045,8 @@ class Interface:
 				contact = gajim.contacts.get_contact(account, str(jid), resource)
 				if not contact:
 					connection = gajim.connections[account]
-					contact = gajim.contacts.create_contact(jid = jid.getStripped(), resource = resource, show = connection.get_status())
+					contact = gajim.contacts.create_contact(jid = jid.getStripped(), 
+							resource = resource, show = connection.get_status())
 				self.roster.new_chat(contact, account, resource = resource)
 
 				ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account)

src/message_control.py

@@ -117,15 +117,26 @@ class MessageControl:
 		return len(gajim.events.get_events(self.account, self.contact.jid))
 
 	def set_session(self, session):
-		if session == self.session:
+		if hasattr(self, 'session') and session == self.session:
 			return
 
-		if self.session:
+		was_encrypted = False
+
+		if hasattr(self, 'session') and self.session:
+			if self.session.enable_encryption:
+				was_encrypted = True
+
 			print "starting a new session, dropping the old one!"
 			gajim.connections[self.account].delete_session(self.session.jid, self.session.thread_id)
 
 		self.session = session
 
+		if session:
+			session.control = self
+
+			if was_encrypted:
+				self.print_esession_details()
+
 	def send_message(self, message, keyID = '', type = 'chat',
 	chatstate = None, msg_id = None, composing_xep = None, resource = None,
 	user_nick = None):
@@ -134,7 +145,10 @@ class MessageControl:
 		jid = self.contact.jid
 
 		if not self.session:
-			self.session = gajim.connections[self.account].make_new_session(self.contact.get_full_jid())
+			fjid = self.contact.get_full_jid()
+			new_session = gajim.connections[self.account].make_new_session(fjid)
+
+			self.set_session(new_session)
 
 		# Send and update history
 		return gajim.connections[self.account].send_message(jid, message, keyID,