Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a bug setting nil soft logout credentials. #6417

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Fix a bug setting nil soft logout credentials. #6417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,18 +899,21 @@ - (void)setSoftLogoutCredentials:(MXCredentials *)softLogoutCredentials
// This is required before updating view's textfields (homeserver url...)
[self loadViewIfNeeded];

// Force register mode
self.authType = MXKAuthenticationTypeLogin;
if (softLogoutCredentials)
{
// Force register mode
self.authType = MXKAuthenticationTypeLogin;

[self setHomeServerTextFieldText:softLogoutCredentials.homeServer];
[self setIdentityServerTextFieldText:softLogoutCredentials.identityServer];
[self setHomeServerTextFieldText:softLogoutCredentials.homeServer];
[self setIdentityServerTextFieldText:softLogoutCredentials.identityServer];

// Cancel potential request in progress
[mxCurrentOperation cancel];
mxCurrentOperation = nil;
// Cancel potential request in progress
[mxCurrentOperation cancel];
mxCurrentOperation = nil;

// Remove the current auth inputs view
self.authInputsView = nil;
// Remove the current auth inputs view
self.authInputsView = nil;
}

// Set parameters and trigger a refresh (the parameters will be taken into account during [handleAuthenticationSession:])
_softLogoutCredentials = softLogoutCredentials;
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-6417.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug where the login screen is shown after choosing to create an account.