hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pgp] Port to new confirmation dialog

Browse Source
This commit is contained in:
Philipp Hörist
2025-01-25 13:12:42 +01:00
parent 9138bb540c
commit f8d5ab3dac
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pgp/plugin.py
View File

@@ -25,7 +25,7 @@ from gajim.common import ged
from gajim.plugins import GajimPlugin from gajim.plugins import GajimPlugin
from gajim.plugins.plugins_i18n import _ from gajim.plugins.plugins_i18n import _
from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import SimpleDialog
from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import DialogButton
from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import ConfirmationCheckDialog
@@ -137,7 +137,6 @@ class PGPPlugin(GajimPlugin):
@staticmethod @staticmethod
def _on_not_trusted(event): def _on_not_trusted(event):
ConfirmationCheckDialog( ConfirmationCheckDialog(
_('Untrusted PGP key'),
_('Untrusted PGP key'), _('Untrusted PGP key'),
_('The PGP key used to encrypt this chat is not ' _('The PGP key used to encrypt this chat is not '
'trusted. Do you really want to encrypt this ' 'trusted. Do you really want to encrypt this '
@@ -159,7 +158,7 @@ class PGPPlugin(GajimPlugin):
try: try:
valid = client.get_module('PGPLegacy').has_valid_key_assigned(jid) valid = client.get_module('PGPLegacy').has_valid_key_assigned(jid)
except KeyMismatch as announced_key_id: except KeyMismatch as announced_key_id:
ErrorDialog( SimpleDialog(
_('PGP Key mismatch'), _('PGP Key mismatch'),
_('The contact\'s key (%s) <b>does not match</b> the key ' _('The contact\'s key (%s) <b>does not match</b> the key '
'assigned in Gajim.') % announced_key_id) 'assigned in Gajim.') % announced_key_id)
@@ -167,12 +166,12 @@ class PGPPlugin(GajimPlugin):
return return
if not valid: if not valid:
ErrorDialog( SimpleDialog(
_('No OpenPGP key assigned'), _('No OpenPGP key assigned'),
_('No OpenPGP key is assigned to this contact.')) _('No OpenPGP key is assigned to this contact.'))
chat_control.sendmessage = False chat_control.sendmessage = False
elif client.get_module('PGPLegacy').get_own_key_data() is None: elif client.get_module('PGPLegacy').get_own_key_data() is None:
ErrorDialog( SimpleDialog(
_('No OpenPGP key assigned'), _('No OpenPGP key assigned'),
_('No OpenPGP key is assigned to your account.')) _('No OpenPGP key is assigned to your account.'))
chat_control.sendmessage = False chat_control.sendmessage = False
@@ -186,4 +185,4 @@ class PGPPlugin(GajimPlugin):
@staticmethod @staticmethod
def _on_file_encryption_error(event): def _on_file_encryption_error(event):
ErrorDialog(_('Error'), event.error) SimpleDialog(_('Error'), event.error)