diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-05-03 12:01:50 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-24 20:09:57 +0200 |
| commit | 6c3a35e531ac0731e223ca79975b1e81c511e50b (patch) | |
| tree | f7745b6f82b9a6f03c8f2f244e91c4916a1913d7 /src/leap | |
| parent | c416fd56ebba9924c1bb0caa60da667204c701e3 (diff) | |
[feat] use active addresses in the key listing
- Related: #8068
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/core/mail_services.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/preferences_email_page.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 2e023f3b..6a9155c6 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -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 diff --git a/src/leap/bitmask/gui/preferences_email_page.py b/src/leap/bitmask/gui/preferences_email_page.py index 93c77df1..fd5a12aa 100644 --- a/src/leap/bitmask/gui/preferences_email_page.py +++ b/src/leap/bitmask/gui/preferences_email_page.py @@ -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"])) |