pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #3150 (otr and require_encryption)

Browse source 
the require_encryption option would not be honored when opening a new
tab with a bare JID.
This commit is contained in:
mathieui 2016-02-02 20:03:17 +01:00
parent dd992600f3
commit b242ea24bc
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/otr.py
View file

@ -541,9 +541,9 @@ class Plugin(BasePlugin):
require = self.config.get_by_tabname('require_encryption', require = self.config.get_by_tabname('require_encryption',
jid, default=False) jid, default=False)
flags['REQUIRE_ENCRYPTION'] = require flags['REQUIRE_ENCRYPTION'] = require
logging_policy = self.config.get_by_tabname('log', jid, default='false').lower() logging_policy = self.config.get_by_tabname('log', jid, default=False)
self.contexts[jid] = PoezioContext(self.account, jid, self.core.xmpp, self.core) self.contexts[jid] = PoezioContext(self.account, jid, self.core.xmpp, self.core)
self.contexts[jid].log = 1 if logging_policy != 'false' else 0 self.contexts[jid].log = 1 if logging_policy else 0
self.contexts[jid].flags = flags self.contexts[jid].flags = flags
return self.contexts[jid] return self.contexts[jid]
@ -756,11 +756,16 @@ class Plugin(BasePlugin):
'jid': name, 'jid': name,
} }
ctx = self.contexts.get(name) ctx = None
default_ctx = self.get_context(name)
if isinstance(tab, DynamicConversationTab) and not tab.locked_resource: if isinstance(tab, DynamicConversationTab) and not tab.locked_resource:
log.debug('Unlocked tab %s found, falling back to the first encrypted chat we find.', name) log.debug('Unlocked tab %s found, falling back to the first encrypted chat we find.', name)
ctx = self.find_encrypted_context_with_matching(jid.bare) ctx = self.find_encrypted_context_with_matching(jid.bare)
if ctx is None:
ctx = default_ctx
if ctx and ctx.state == STATE_ENCRYPTED: if ctx and ctx.state == STATE_ENCRYPTED:
ctx.sendMessage(0, msg['body'].encode('utf-8')) ctx.sendMessage(0, msg['body'].encode('utf-8'))
if not tab.send_chat_state('active'): if not tab.send_chat_state('active'):