copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do not allow enabling GPG if E2E is active and vice versa. Lazily fixes #3633.

Browse source 
Do not try to send encrypted messages when we don't use GPG, though it is enabled per user.
This commit is contained in:
Stephan Erb 2007-12-30 16:30:37 +00:00
parent 8be83102b7
commit 282bc3346e
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/chat_control.py
View file

@ -1053,10 +1053,13 @@ class ChatControl(ChatControlBase):
self.set_session(session) self.set_session(session)
# Enable ecryption if needed # Enable ecryption if needed
e2e_is_active = hasattr(self, 'session') and self.session and self.session.enable_encryption
self.gpg_is_active = False
gpg_pref = gajim.config.get_per('contacts', contact.jid, gpg_pref = gajim.config.get_per('contacts', contact.jid,
'gpg_enabled') 'gpg_enabled')
if gpg_pref and gajim.config.get_per('accounts', self.account, 'keyid') and\ if not e2e_is_active and gpg_pref and gajim.config.get_per('accounts', self.account, 'keyid') and\
gajim.connections[self.account].USE_GPG: gajim.connections[self.account].USE_GPG:
self.gpg_is_active = True
gajim.encrypted_chats[self.account].append(contact.jid) gajim.encrypted_chats[self.account].append(contact.jid)
msg = _('GPG encryption enabled') msg = _('GPG encryption enabled')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None) ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
@ -1256,15 +1259,15 @@ class ChatControl(ChatControlBase):
def _toggle_gpg(self): def _toggle_gpg(self):
ec = gajim.encrypted_chats[self.account] ec = gajim.encrypted_chats[self.account]
if self.contact.jid in ec: if self.gpg_is_active:
# Disable encryption # Disable encryption
ec.remove(self.contact.jid) ec.remove(self.contact.jid)
gpg_is_active = False self.gpg_is_active = False
msg = _('GPG encryption disabled') msg = _('GPG encryption disabled')
else: else:
# Enable encryption # Enable encryption
ec.append(self.contact.jid) ec.append(self.contact.jid)
gpg_is_active = True self.gpg_is_active = True
msg = _('GPG encryption enabled') msg = _('GPG encryption enabled')
gpg_pref = gajim.config.get_per('contacts', self.contact.jid, gpg_pref = gajim.config.get_per('contacts', self.contact.jid,
@ -1272,7 +1275,7 @@ class ChatControl(ChatControlBase):
if gpg_pref is None: if gpg_pref is None:
gajim.config.add_per('contacts', self.contact.jid) gajim.config.add_per('contacts', self.contact.jid)
gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled',
gpg_is_active) self.gpg_is_active)
ChatControlBase.print_conversation_line(self, msg, 'status', '', None) ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
def _process_command(self, message): def _process_command(self, message):
@ -1361,9 +1364,7 @@ class ChatControl(ChatControlBase):
encrypted = bool(self.session) and self.session.enable_encryption encrypted = bool(self.session) and self.session.enable_encryption
keyID = '' keyID = ''
gpg_pref = gajim.config.get_per('contacts', contact.jid, if self.gpg_is_active:
'gpg_enabled')
if gpg_pref:
keyID = contact.keyID keyID = contact.keyID
encrypted = True encrypted = True
if keyID == '': if keyID == '':
@ -1506,13 +1507,12 @@ class ChatControl(ChatControlBase):
'status', '', tim) 'status', '', tim)
else: else:
# GPG encryption # GPG encryption
ec = gajim.encrypted_chats[self.account] if encrypted and not self.gpg_is_active:
if encrypted and jid not in ec:
msg = _('The following message was encrypted') msg = _('The following message was encrypted')
ChatControlBase.print_conversation_line(self, msg, ChatControlBase.print_conversation_line(self, msg,
'status', '', tim) 'status', '', tim)
self._toggle_gpg() self._toggle_gpg()
elif not encrypted and jid in ec: elif not encrypted and self.gpg_is_active:
msg = _('The following message was NOT encrypted') msg = _('The following message was NOT encrypted')
ChatControlBase.print_conversation_line(self, msg, ChatControlBase.print_conversation_line(self, msg,
'status', '', tim) 'status', '', tim)
@ -1649,10 +1649,9 @@ class ChatControl(ChatControlBase):
gajim.jid_is_transport(jid): gajim.jid_is_transport(jid):
toggle_gpg_menuitem.set_sensitive(False) toggle_gpg_menuitem.set_sensitive(False)
else: else:
toggle_gpg_menuitem.set_sensitive(True) e2e_is_active = int(self.session != None and self.session.enable_encryption)
gpg_pref = gajim.config.get_per('contacts', jid, toggle_gpg_menuitem.set_sensitive(not e2e_is_active)
'gpg_enabled') toggle_gpg_menuitem.set_active(self.gpg_is_active)
toggle_gpg_menuitem.set_active(bool(gpg_pref))
# TODO: check that the remote client supports e2e # TODO: check that the remote client supports e2e
if not gajim.HAVE_PYCRYPTO: if not gajim.HAVE_PYCRYPTO:
@ -1660,6 +1659,7 @@ class ChatControl(ChatControlBase):
else: else:
isactive = int(self.session != None and self.session.enable_encryption) isactive = int(self.session != None and self.session.enable_encryption)
toggle_e2e_menuitem.set_active(isactive) toggle_e2e_menuitem.set_active(isactive)
toggle_e2e_menuitem.set_sensitive(not self.gpg_is_active)
# If we don't have resource, we can't do file transfer # If we don't have resource, we can't do file transfer
# in transports, contact holds our info we need to disable it too # in transports, contact holds our info we need to disable it too