Changeset 9771 for trunk/src/common/connection_handlers.py

Timestamp:

06/08/08 17:27:05 (6 months ago)

Author:

js

Message:

Completely remove OTR.

Sorry, it just wasn't maintainable. The problem is the current libotr
API. I'm sick of working around the strange libotr API, sick of getting
HTML messages, sick of losing messages. The final argument for
completely removing it was that we can't get the message ID of a sent
msg anymore - which we need. I tried to work around this as well, but
there seems to be no way to wait for a signal in glib the way I would
need it for the workaround (I wanted to emit a signal in inject_message
and then wait for it after the call to otr_message_fragment_and_send
so the signal can pass us the message id). And the last reason is that
we're heading towards a new release and thus want to stabilize the code,
thus don't have time to work around even more libotr API strangeness.
I will give feedback to the libotr developers, who are currently
planning a new API, so that we can hopefully see OTR support once again
as soon as libotr4 is released.

Kjell already announced that he will continue his branch:
https://code.launchpad.net/~afflux/gajim/otr

I really hope the libotr devs will provide a sane API with libotr4 so
we can integrate OTR support again.

Oh, and I added one more try/except block for OS X.

Files:

• trunk/src/common/connection_handlers.py (modified) (2 diffs)

trunk/src/common/connection_handlers.py

@@ -1219 +1219 @@
                 self.sessions = {}
 
-                if gajim.otr_module:
-                        self.otr_userstates = gajim.otr_module.otrl_userstate_create()
-
         def _FeatureNegCB(self, con, stanza, session):
                 gajim.log.debug('FeatureNegCB')
@@ -1705 +1702 @@
                         receipt.setThread(thread_id)
                         con.send(receipt)
-
-                # We don't trust libotr, that's why we only pass the message
-                # to it if necessary. otrl_proto_message_type does this check.
-                if gajim.otr_module and not xep_200_encrypted \
-                and isinstance(msgtxt, unicode) and \
-                gajim.otr_module.otrl_proto_message_type(msgtxt.encode()) != \
-                gajim.otr_module.OTRL_MSGTYPE_NOTOTR:
-                        # set to encrypted if it's really encrypted.
-                        if gajim.otr_module.otrl_proto_message_type(
-                        msgtxt.encode()) != \
-                        gajim.otr_module.OTRL_MSGTYPE_TAGGEDPLAINTEXT:
-                                encrypted = True
-
-                        # TODO: Do we really need .encode()?
-                        # yes we do. OTR can't handle unicode.
-                        otr_msg_tuple = \
-                                gajim.otr_module.otrl_message_receiving(
-                                self.otr_userstates,
-                                (gajim.otr_ui_ops, {'account': self.name}),
-                                gajim.get_jid_from_account(self.name).encode(),
-                                gajim.OTR_PROTO,
-                                frm.encode(),
-                                msgtxt.encode(),
-                                (gajim.otr_add_appdata, self.name))
-                        msgtxt = unicode(otr_msg_tuple[1])
-
-                        html_node = msg.getTag('html')
-                        if html_node:
-                                msg.delChild(html_node)
-                        msg.setBody(msgtxt)
-
-                        if gajim.otr_module.otrl_tlv_find(
-                        otr_msg_tuple[2],
-                        gajim.otr_module.OTRL_TLV_DISCONNECTED) != None:
-                                gajim.otr_ui_ops.gajim_log(_('%s ' \
-                                        'has ended his/her private ' \
-                                        'conversation with you. You should ' \
-                                        'do the same.') % frm,
-                                        self.name,
-                                        frm.encode())
-
-                                ctrls = gajim.interface.msg_win_mgr.get_chat_controls(jid, self.name)
-                                for ctrl in ctrls:
-                                        ctrl.update_otr()
-
-                        ctx = gajim.otr_module. \
-                                otrl_context_find(
-                                self.otr_userstates,
-                                frm.encode(),
-                                gajim.get_jid_from_account(
-                                self.name).encode(),
-                                gajim.OTR_PROTO, 1,
-                                (gajim.otr_add_appdata,
-                                self.name))[0]
-                        tlvs = otr_msg_tuple[2]
-                        ctx.app_data.handle_tlv(tlvs)
-
-                        if msgtxt == '':
-                                return
-                elif msgtxt != None and msgtxt != '':
-                        gajim.otr_dont_append_tag[frm] = True
-
-                        # We're also here if we just don't
-                        # support OTR. Thus, we should strip
-                        # the tags from plaintext messages
-                        # since they look ugly.
-                        msgtxt = msgtxt.replace('\x20\x09\x20' \
-                                '\x20\x09\x09\x09\x09\x20\x09' \
-                                '\x20\x09\x20\x09\x20\x20', '')
-                        msgtxt = msgtxt.replace('\x20\x09\x20' \
-                                '\x09\x20\x20\x09\x20', '')
-                        msgtxt = msgtxt.replace('\x20\x20\x09' \
-                                '\x09\x20\x20\x09\x20', '')
 
                 if mtype != 'groupchat':