[feat] mail status will only work for a valid userid

We used to return the system status if no userid is provided. We don't
do it anymore, now is only userid based.

- Resolves: #8785

1 files changed, 5 insertions, 5 deletions

diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 4e67ac45..92712019 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -571,16 +571,16 @@ class StandardMailService(service.MultiService, HookableService):
     # commands
 
     @defer.inlineCallbacks
-    def do_status(self, userid=None):
+    def do_status(self, userid):
         smtp = self.getServiceNamed('smtp')
         imap = self.getServiceNamed('imap')
+        incoming = self.getServiceNamed('incoming_mail')
+        incoming_status = yield incoming.status(userid)
         childrenStatus = {
             'smtp': smtp.status(),
-            'imap': imap.status()
+            'imap': imap.status(),
+            'incoming': incoming_status
         }
-        if userid is not None:
-            incoming = self.getServiceNamed('incoming_mail')
-            childrenStatus['incoming'] = yield incoming.status(userid)
 
         def key(service):
             status = childrenStatus[service]