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

Remove unused identityEnabled property from ValidatedServerConfig
This commit is contained in:
Travis Ralston 2019-07-12 08:11:55 -06:00 committed by GitHub
commit 5f98e4ea61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 5 deletions

View file

@ -39,7 +39,6 @@ export const TYPES = {
hsName: "matrix.org",
hsNameIsDifferent: false,
isUrl: "https://vector.im",
identityEnabled: true,
}),
},
PREMIUM: {

View file

@ -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,
});
}

View file

@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) {
hsName: "TEST_ENVIRONMENT",
hsNameIsDifferent: false, // yes, we lie
isUrl,
identityEnabled: true,
});
}