diff options
| author | Kali Kaneko <kali@leap.se> | 2015-03-06 11:48:09 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-03-09 14:47:56 -0400 |
| commit | e73b98496e865b1b3573de53b7b6f48217543587 (patch) | |
| tree | 5cf18533d143aefbe8fc64825666ff276bd424c0 | |
| parent | f78e2d196a89c2881c1f9c72dd380033f957af1c (diff) | |
[bug] fix concatenation of full_user_id to make mail work0.8.2release/0.8.x
At some moment, the semantics of the username that we pick from the
login widget changed, so that there's a duplication of the domain part
in the full_user_id that we were passing to the keymanager and the mail
services.
This fix has already been done in the current develop branch (for next
release 0.9.0), so there's no need to port it when merging it back.
While it is true that there's no official release of the client supporting
mail yet, this was an easy fix to port so we will do a 0.8.2
bugfix release so that the 0.8 branch can be used experimentally to test
against development providers. This doesn't mean that you can expect
support on the 0.8.x branch yet, it's only that there is one less bug in
here :)
Resolves: #6759
Releases: 0.8.2
| -rw-r--r-- | changes/bug_6759_fix_user_id | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 | ||||
| -rw-r--r-- | src/leap/bitmask/services/mail/smtpbootstrapper.py | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/changes/bug_6759_fix_user_id b/changes/bug_6759_fix_user_id new file mode 100644 index 00000000..f4ea6385 --- /dev/null +++ b/changes/bug_6759_fix_user_id @@ -0,0 +1 @@ +- #6759 Fix formation of full_userid, allowing the right id to be passed to keymanager and mail services diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index cbf7a636..1583edae 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1193,7 +1193,12 @@ class MainWindow(QtGui.QMainWindow, SignalTracker): user = self._login_widget.get_logged_user() domain = self._providers.get_selected_provider() - full_user_id = make_address(user, domain) + + # XXX fix for 0.8.2: this user id has changed! + # BUG -- do not merge into develop, it's already fixed there. + # full_user_id = make_address(user, domain) + full_user_id = user + self._mail_conductor.userid = full_user_id self._start_eip_bootstrap() self.ui.action_create_new_account.setEnabled(True) @@ -1311,7 +1316,9 @@ class MainWindow(QtGui.QMainWindow, SignalTracker): provider_domain = self._providers.get_selected_provider() if flags.OFFLINE: - full_user_id = make_address(username, provider_domain) + # BUG --- fix for 0.8.2 + # full_user_id = make_address(username, provider_domain) + full_user_id = username uuid = self._settings.get_uuid(full_user_id) self._mail_conductor.userid = full_user_id diff --git a/src/leap/bitmask/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py index 9dd61488..eee8b6c4 100644 --- a/src/leap/bitmask/services/mail/smtpbootstrapper.py +++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py @@ -152,7 +152,7 @@ class SMTPBootstrapper(AbstractBootstrapper): self._provider_config = ProviderConfig.get_provider_config(domain) self._keymanager = keymanager self._smtp_config = SMTPConfig() - self._userid = userid + self._userid = str(userid) self._download_if_needed = download_if_needed try: |