Unverified Commit 6c3a35e5 authored by meskio's avatar meskio
Browse files

[feat] use active addresses in the key listing

- Related: #8068
parent c416fd56
......@@ -351,7 +351,7 @@ class KeymanagerService(HookableService):
d = km.get_all_keys()
d.addCallback(
lambda keys: [
(key.uids, key.fingerprint) for key in keys])
(key.address, key.fingerprint) for key in keys])
return d
......
......@@ -219,8 +219,11 @@ class PreferencesEmailPage(PreferencesPage):
for key in keys:
row = self.ui.keys_table.rowCount()
self.ui.keys_table.insertRow(row)
address = key["address"]
if not address: # can be None if it's not active
address = "--"
self.ui.keys_table.setItem(
row, 0, QtGui.QTableWidgetItem(" ".join(key["uids"])))
row, 0, QtGui.QTableWidgetItem(address))
self.ui.keys_table.setItem(
row, 1, QtGui.QTableWidgetItem(key["fingerprint"]))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment