Changeset 9222

Timestamp:

12/30/07 17:30:37 (11 months ago)

Author:

steve-e

Message:

Do not allow enabling GPG if E2E is active and vice versa. Lazily fixes #3633.
Do not try to send encrypted messages when we don't use GPG, though it is enabled per user.

Files:

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

trunk/src/chat_control.py

@@ -1054 +1054 @@
 
                 # 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_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:
+                        self.gpg_is_active = True
                         gajim.encrypted_chats[self.account].append(contact.jid)
                         msg = _('GPG encryption enabled')
@@ -1257 +1260 @@
         def _toggle_gpg(self):
                 ec = gajim.encrypted_chats[self.account]
-                if self.contact.jid in ec:
+                if self.gpg_is_active:
                         # Disable encryption
                         ec.remove(self.contact.jid)
-                        gpg_is_active = False
+                        self.gpg_is_active = False
                         msg = _('GPG encryption disabled')
                 else:
                         # Enable encryption
                         ec.append(self.contact.jid)
-                        gpg_is_active = True
+                        self.gpg_is_active = True
                         msg = _('GPG encryption enabled')
 
@@ -1273 +1276 @@
                         gajim.config.add_per('contacts', self.contact.jid)
                 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)
 
@@ -1362 +1365 @@
 
                 keyID = ''
-                gpg_pref = gajim.config.get_per('contacts', contact.jid,
-                        'gpg_enabled')
-                if gpg_pref:
+                if self.gpg_is_active:
                         keyID = contact.keyID
                         encrypted = True
@@ -1507 +1508 @@
                         else:
                                 # GPG encryption
-                                ec = gajim.encrypted_chats[self.account]
-                                if encrypted and jid not in ec:
+                                if encrypted and not self.gpg_is_active:
                                         msg = _('The following message was encrypted')
                                         ChatControlBase.print_conversation_line(self, msg, 
                                                 'status', '', tim)
                                         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')
                                         ChatControlBase.print_conversation_line(self, msg,
@@ -1650 +1650 @@
                         toggle_gpg_menuitem.set_sensitive(False)
                 else:
-                        toggle_gpg_menuitem.set_sensitive(True)
-                        gpg_pref = gajim.config.get_per('contacts', jid,
-                                'gpg_enabled')
-                        toggle_gpg_menuitem.set_active(bool(gpg_pref))
+                        e2e_is_active = int(self.session != None and self.session.enable_encryption)
+                        toggle_gpg_menuitem.set_sensitive(not e2e_is_active)
+                        toggle_gpg_menuitem.set_active(self.gpg_is_active)
 
                 # TODO: check that the remote client supports e2e
@@ -1661 +1660 @@
                         isactive = int(self.session != None and self.session.enable_encryption)
                         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