don't allow to send xhtml when gpg is active (because this part is not encrypted). Fixes #4650

src/chat_control.py

@@ -1232,7 +1232,8 @@ class ChatControl(ChatControlBase):
 	def update_toolbar(self):
 		# Formatting
 		if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \
-		and not gajim.capscache.is_supported(self.contact, 'notexistant'):
+		and not gajim.capscache.is_supported(self.contact, 'notexistant') \
+		and not self.gpg_is_active:
 			self._formattings_button.set_sensitive(True)
 		else:
 			self._formattings_button.set_sensitive(False)

src/common/connection.py

@@ -1162,6 +1162,7 @@ class Connection(ConnectionHandlers):
 			fjid = str(session.jid)
 
 		if keyID and self.USE_GPG:
+			xhtml = None
 			if keyID ==  'UNKNOWN':
 				error = _('Neither the remote presence is signed, nor a key was assigned.')
 			elif keyID.endswith('MISMATCH'):