summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/backend
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-18 23:44:12 -0700
committerKali Kaneko <kali@leap.se>2016-04-19 12:00:23 -0400
commit229f803235ae9b9a71313d11071c7a0fbea0a681 (patch)
treefada7035628c90757b6b0cd7cf34182d1b6269fc /src/leap/bitmask/backend
parentc6db8a1f9ba7b6fc9dd117c0a699f4dfd339a375 (diff)
[feature] add email panel to preferences
Diffstat (limited to 'src/leap/bitmask/backend')
-rw-r--r--src/leap/bitmask/backend/components.py20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index acb562c7..3192e1c4 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -576,8 +576,10 @@ class EIP(object):
self._signaler.eip_uninitialized_provider)
return
- eip_config = eipconfig.EIPConfig()
provider_config = ProviderConfig.get_provider_config(domain)
+ if EIP_SERVICE not in provider_config.get_services():
+ return
+ eip_config = eipconfig.EIPConfig()
api_version = provider_config.get_api_version()
eip_config.set_api_version(api_version)
@@ -1003,13 +1005,11 @@ class Keymanager(object):
def get_key_details(self, username):
"""
- List all the keys stored in the local DB.
+ Get information on our primary key pair
"""
def signal_details(public_key):
- # XXX: We should avoid the key-id
- details = (public_key.fingerprint[-16:], public_key.fingerprint)
self._signaler.signal(self._signaler.keymanager_key_details,
- details)
+ public_key.get_dict())
d = self._keymanager_proxy.get_key(username,
openpgp.OpenPGPKey)
@@ -1215,15 +1215,13 @@ class Authenticate(object):
def get_logged_in_status(self):
"""
- Signal if the user is currently logged in or not.
+ Signal if the user is currently logged in or not. If logged in,
+ authenticated username is passed as argument to the signal.
"""
if self._signaler is None:
return
- signal = None
if self._is_logged_in():
- signal = self._signaler.srp_status_logged_in
+ self._signaler.signal(self._signaler.srp_status_logged_in)
else:
- signal = self._signaler.srp_status_not_logged_in
-
- self._signaler.signal(signal)
+ self._signaler.signal(self._signaler.srp_status_not_logged_in)