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

[openpgp] Fix various type errors

Browse Source
This commit is contained in:
Philipp Hörist
2026-01-02 20:27:36 +01:00
parent b2986f45f9
commit e6ea3f402f
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
openpgp/gtk/wizard.py
View File

@@ -14,6 +14,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenPGP Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. # along with OpenPGP Gajim Plugin. If not, see <http://www.gnu.org/licenses/>.
from __future__ import annotations
from typing import cast from typing import cast
import logging import logging
@@ -74,24 +76,27 @@ class KeyWizard(Gtk.Assistant):
self._remove_sidebar() self._remove_sidebar()
self.show() self.show()
def _add_page(self, page: Gtk.Box) -> None: def _add_page(self, page: PagesT) -> None:
self.append_page(page) self.append_page(page)
self.set_page_type(page, page.type_) self.set_page_type(page, page.type_)
self.set_page_title(page, page.title) self.set_page_title(page, page.title)
self.set_page_complete(page, page.complete) self.set_page_complete(page, page.complete)
def _remove_sidebar(self): def _remove_sidebar(self) -> None:
main_box = self.get_child() main_box = cast(Gtk.Box, self.get_child())
sidebar = main_box.get_first_child() sidebar = main_box.get_first_child()
assert sidebar is not None
main_box.remove(sidebar) main_box.remove(sidebar)
def _activate_encryption(self): def _activate_encryption(self):
action = app.window.lookup_action("set-encryption") action = app.window.lookup_action("set-encryption")
assert action is not None
action.activate(GLib.Variant("s", self._plugin.encryption_name)) action.activate(GLib.Variant("s", self._plugin.encryption_name))
def _on_page_change(self, assistant: Gtk.Assistant, page: Page) -> None: def _on_page_change(self, assistant: Gtk.Assistant, page: PagesT) -> None:
if self.get_current_page() == Page.NEWKEY: if self.get_current_page() == Page.NEWKEY:
if self._client.get_module("OpenPGP").secret_key_available: page = cast(NewKeyPage, page)
if self._client.get_module("OpenPGP").secret_key_available: # pyright: ignore
self.set_current_page(Page.SUCCESS) self.set_current_page(Page.SUCCESS)
else: else:
page.generate() page.generate()
@@ -165,7 +170,7 @@ class NewKeyPage(RequestPage):
def worker(self): def worker(self):
text = None text = None
try: try:
self._client.get_module("OpenPGP").generate_key() self._client.get_module("OpenPGP").generate_key() # pyright: ignore
except Exception as error: except Exception as error:
text = str(error) text = str(error)
@@ -173,9 +178,9 @@ class NewKeyPage(RequestPage):
def finished(self, error: str | None) -> None: def finished(self, error: str | None) -> None:
if error is None: if error is None:
self._client.get_module("OpenPGP").get_own_key_details() self._client.get_module("OpenPGP").get_own_key_details() # pyright: ignore
self._client.get_module("OpenPGP").set_public_key() self._client.get_module("OpenPGP").set_public_key() # pyright: ignore
self._client.get_module("OpenPGP").request_keylist() self._client.get_module("OpenPGP").request_keylist() # pyright: ignore
self._assistant.set_current_page(Page.SUCCESS) self._assistant.set_current_page(Page.SUCCESS)
else: else:
error_page = cast(ErrorPage, self._assistant.get_nth_page(Page.ERROR)) error_page = cast(ErrorPage, self._assistant.get_nth_page(Page.ERROR))
@@ -242,3 +247,6 @@ class ErrorPage(Gtk.Box):
def set_text(self, text: str) -> None: def set_text(self, text: str) -> None:
self._label.set_text(text) self._label.set_text(text)
PagesT = WelcomePage | RequestPage | NewKeyPage | SuccessfulPage | ErrorPage

3
openpgp/pgpplugin.py
View File

@@ -148,6 +148,7 @@ class OpenPGPPlugin(GajimPlugin):
def activate_encryption(self, chat_control: ChatControl) -> bool: def activate_encryption(self, chat_control: ChatControl) -> bool:
account = chat_control.account account = chat_control.account
assert chat_control.contact is not None
jid = chat_control.contact.jid jid = chat_control.contact.jid
openpgp = self.get_openpgp_module(account) openpgp = self.get_openpgp_module(account)
if openpgp.secret_key_available: if openpgp.secret_key_available:
@@ -175,6 +176,7 @@ class OpenPGPPlugin(GajimPlugin):
@staticmethod @staticmethod
def _on_encryption_button_clicked(chat_control: ChatControl) -> None: def _on_encryption_button_clicked(chat_control: ChatControl) -> None:
account = chat_control.account account = chat_control.account
assert chat_control.contact is not None
jid = chat_control.contact.jid jid = chat_control.contact.jid
from openpgp.gtk.key import KeyDialog from openpgp.gtk.key import KeyDialog
@@ -183,6 +185,7 @@ class OpenPGPPlugin(GajimPlugin):
def _before_sendmessage(self, chat_control: ChatControl) -> None: def _before_sendmessage(self, chat_control: ChatControl) -> None:
account = chat_control.account account = chat_control.account
assert chat_control.contact is not None
jid = chat_control.contact.jid jid = chat_control.contact.jid
openpgp = self.get_openpgp_module(account) openpgp = self.get_openpgp_module(account)