Merge pull request #591 from matrix-org/riot_2643

Riot: Ability to disable all identity server functionality via the config file
matrix-org · Aug 14, 2019 · 65d2287 · 65d2287
2 parents 7e084a3 + de3b5b4
commit 65d2287
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/MatrixKit/Controllers/MXKAuthenticationViewController.m b/MatrixKit/Controllers/MXKAuthenticationViewController.m
@@ -503,13 +503,7 @@ - (void)setHomeServerTextFieldText:(NSString *)homeServerUrl
 }
 
 - (void)setIdentityServerTextFieldText:(NSString *)identityServerUrl
-{
-    if (!identityServerUrl.length)
-    {
-        // Force refresh with default value
-        identityServerUrl = _defaultIdentityServerUrl;
-    }
-
+{    
     _identityServerTextField.text = identityServerUrl;
 
     // Update REST client

diff --git a/MatrixKit/Models/Account/MXKAccount.m b/MatrixKit/Models/Account/MXKAccount.m
@@ -272,9 +272,8 @@ - (void)setIdentityServerURL:(NSString *)identityServerURL
     }
     else
     {
-        _identityServerURL = nil;
-        // By default, use the same address for the identity server
-        [mxRestClient setIdentityServer:mxCredentials.homeServer];
+        _identityServerURL = nil;        
+        [mxRestClient setIdentityServer:nil];
     }
 
     // Archive updated field