Changeset 9602 for trunk/src/chat_control.py

Timestamp:

05/09/08 14:35:25 (4 months ago)

Author:

js

Message:

Added OTR support.
Work done by Kjell Braden <fnord@…>.
Some fixes done by me.

Files:

• trunk/src/chat_control.py (modified) (4 diffs)

trunk/src/chat_control.py

@@ -1177 +1177 @@
 
         def update_ui(self):
+                if gajim.otr_module:
+                        self.update_otr(True)
                 # The name banner is drawn here
                 ChatControlBase.update_ui(self)
+
+        def update_otr(self, print_status=False):
+                # retrieve the OTR context from the chat's contact data
+                ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                        self.contact.get_full_jid().encode(),
+                        gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,
+                        (gajim.otr_add_appdata, self.account))[0]
+                
+                enc_status = False
+                otr_status_text = ""
+                if ctx.msgstate == gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED:
+                        enc_status = True
+                        if ctx.active_fingerprint.trust:
+                                otr_status_text = u"authenticated secure OTR connection"
+                        else:
+                                otr_status_text = u'*unauthenticated* secure OTR connection'
+                elif ctx.msgstate == gajim.otr_module.OTRL_MSGSTATE_FINISHED:
+                        enc_status = True
+                        otr_status_text = u"finished OTR connection"
+                else:
+                        # nothing to print
+                        print_status = False
+                self._show_lock_image(enc_status, u'OTR', enc_status, True)
+                if print_status:
+                        self.print_conversation_line(u" [OTR] %s"%otr_status_text, 'status',
+                                        '', None)
 
         def _update_banner_state_image(self):
@@ -1697 +1725 @@
                 toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
                 toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem')
+                otr_submenu = xml.get_widget('otr_submenu')
+                otr_settings_menuitem = xml.get_widget('otr_settings_menuitem')
+                smp_otr_menuitem = xml.get_widget('smp_otr_menuitem')
+                start_otr_menuitem = xml.get_widget('start_otr_menuitem')
+                end_otr_menuitem = xml.get_widget('end_otr_menuitem')
                 add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
                 send_file_menuitem = xml.get_widget('send_file_menuitem')
@@ -1782 +1815 @@
                         self._on_convert_to_gc_menuitem_activate)
                 self.handlers[id] = convert_to_gc_menuitem
+
+                if gajim.otr_module:
+                        otr_submenu.show()
+                        id = otr_settings_menuitem.connect('activate',
+                                self._on_otr_settings_menuitem_activate)
+                        self.handlers[id] = otr_settings_menuitem
+                        id = start_otr_menuitem.connect('activate',
+                                self._on_start_otr_menuitem_activate)
+                        self.handlers[id] = start_otr_menuitem
+                        id = end_otr_menuitem.connect('activate',
+                                self._on_end_otr_menuitem_activate)
+                        self.handlers[id] = end_otr_menuitem
+                        id = smp_otr_menuitem.connect('activate',
+                                self._on_smp_otr_menuitem_activate)
+                        self.handlers[id] = smp_otr_menuitem
+
+                        ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                                self.contact.get_full_jid().encode(),
+                                gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,
+                                (gajim.otr_add_appdata, self.account))[0]
+                        # can end only when PLAINTEXT
+                        end_otr_menuitem.set_sensitive(ctx.msgstate !=
+                                gajim.otr_module.OTRL_MSGSTATE_PLAINTEXT)
+                        # can SMP only when ENCRYPTED
+                        smp_otr_menuitem.set_sensitive(ctx.msgstate ==
+                                gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED)
+
                 menu.connect('selection-done', self.destroy_menu, history_menuitem,
                         information_menuitem)
@@ -2260 +2320 @@
                         self.session.negotiate_e2e(False)
 
+        def _on_start_otr_menuitem_activate(self, widget):
+                # ?OTR? gets replaced with a better message internally in otrl_message_sending
+                MessageControl.send_message(self, u"?OTR?", type="chat")
+        def _on_end_otr_menuitem_activate(self, widget):
+                fjid = self.contact.get_full_jid()
+                gajim.otr_module.otrl_message_disconnect(gajim.otr_userstates[self.account],
+                                (gajim.otr_ui_ops, {'account':self.account,'urgent':True}),
+                                gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO,
+                                fjid.encode())
+                gajim.otr_ui_ops.gajim_log("Private conversation with %s lost."%fjid,
+                                self.account, fjid.encode())
+                self.update_ui()
+        def _on_otr_settings_menuitem_activate(self, widget):
+                gajim.otr_windows.ContactOtrWindow(self.contact, self.account, self)
+        def _on_smp_otr_menuitem_activate(self, widget):
+                ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                        self.contact.get_full_jid().encode(),
+                        gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,
+                        (gajim.otr_add_appdata, self.account))[0]
+                ctx.app_data.show(False)
+
         def got_connected(self):
                 ChatControlBase.got_connected(self)