Merge pull request #3213 from matrix-org/travis/remove-is-flag

Remove unused identityEnabled property from ValidatedServerConfig
matrix-org · Jul 12, 2019 · 5f98e4e · 5f98e4e
2 parents 28c3578 + 285b126
commit 5f98e4e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
@@ -39,7 +39,6 @@ export const TYPES = {
             hsName: "matrix.org",
             hsNameIsDifferent: false,
             isUrl: "https://vector.im",
-            identityEnabled: true,
         }),
     },
     PREMIUM: {

diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
@@ -18,7 +18,6 @@ import React from 'react';
 import {AutoDiscovery} from "matrix-js-sdk";
 import {_t, _td, newTranslatableError} from "../languageHandler";
 import {makeType} from "./TypeUtils";
-import SdkConfig from "../SdkConfig";
 
 const LIVELINESS_DISCOVERY_ERRORS = [
     AutoDiscovery.ERROR_INVALID_HOMESERVER,
@@ -31,7 +30,6 @@ export class ValidatedServerConfig {
     hsNameIsDifferent: string;
 
     isUrl: string;
-    identityEnabled: boolean;
 
     isDefault: boolean;
 }
@@ -236,7 +234,6 @@ export default class AutoDiscoveryUtils {
             hsName: preferredHomeserverName,
             hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
-            identityEnabled: !SdkConfig.get()['disable_identity_server'],
             isDefault: false,
         });
     }

diff --git a/test/test-utils.js b/test/test-utils.js
@@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) {
         hsName: "TEST_ENVIRONMENT",
         hsNameIsDifferent: false, // yes, we lie
         isUrl,
-        identityEnabled: true,
     });
 }