Commit 64e4a8e4 authored by elijah's avatar elijah
Browse files

Merge branch 'bug/preferences_keys' of https://github.com/meskio/bitmask_client into develop

parents 68096fa8 5a1dd49d
......@@ -994,14 +994,14 @@ class Keymanager(object):
d.addCallback(export)
d.addErrback(log_error)
@defer.inlineCallbacks
def list_keys(self):
"""
List all the keys stored in the local DB.
"""
d = self._keymanager_proxy.get_all_keys()
d.addCallback(
lambda keys:
self._signaler.signal(self._signaler.keymanager_keys_list, keys))
keys = yield self._keymanager_proxy.get_all_keys()
keydicts = [dict(key) for key in keys]
self._signaler.signal(self._signaler.keymanager_keys_list, keydicts)
def get_key_details(self, username):
"""
......@@ -1009,7 +1009,7 @@ class Keymanager(object):
"""
def signal_details(public_key):
self._signaler.signal(self._signaler.keymanager_key_details,
public_key.get_dict())
dict(public_key))
d = self._keymanager_proxy.get_key(username,
openpgp.OpenPGPKey)
......
......@@ -90,6 +90,8 @@ class PreferencesEmailPage(PreferencesPage):
connect signals
"""
self.app.signaler.keymanager_key_details.connect(self._key_details)
self.app.signaler.keymanager_keys_list.connect(
self._keymanager_keys_list)
self.app.signaler.keymanager_export_ok.connect(
self._keymanager_export_ok)
self.app.signaler.keymanager_export_error.connect(
......@@ -218,9 +220,9 @@ class PreferencesEmailPage(PreferencesPage):
row = self.ui.keys_table.rowCount()
self.ui.keys_table.insertRow(row)
self.ui.keys_table.setItem(
row, 0, QtGui.QTableWidgetItem(key.address))
row, 0, QtGui.QTableWidgetItem(" ".join(key["uids"])))
self.ui.keys_table.setItem(
row, 1, QtGui.QTableWidgetItem(key.fingerprint))
row, 1, QtGui.QTableWidgetItem(key["fingerprint"]))
def _toggle_webmail(self, state):
value = True if state == QtCore.Qt.Checked else False
......
......@@ -581,7 +581,7 @@
</column>
<column>
<property name="text">
<string>Key ID</string>
<string>Fingerprint</string>
</property>
</column>
</widget>
......
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