remove unused code around unimplemented ExperimentalSettings.EnableClickToReply setting (#20389)

Этот коммит содержится в:
darkLord19
2022-06-09 01:10:30 +05:30
коммит произвёл GitHub
родитель 2c63e8dd08
Коммит a251510717
3 изменённых файлов: 0 добавлений и 7 удалений

Просмотреть файл

@@ -53,7 +53,6 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
// This setting is only temporary, so keep using the old setting name for the mobile and web apps
props["ExperimentalEnablePostMetadata"] = "true"
props["ExperimentalEnableClickToReply"] = strconv.FormatBool(*c.ExperimentalSettings.EnableClickToReply)
props["ExperimentalCloudBilling"] = strconv.FormatBool(*c.ExperimentalSettings.CloudBilling)
props["EnableAppBar"] = strconv.FormatBool(*c.ExperimentalSettings.EnableAppBar)

Просмотреть файл

@@ -942,7 +942,6 @@ func (s *MetricsSettings) SetDefaults() {
type ExperimentalSettings struct {
ClientSideCertEnable *bool `access:"experimental_features,cloud_restrictable"`
ClientSideCertCheck *string `access:"experimental_features,cloud_restrictable"`
EnableClickToReply *bool `access:"experimental_features,write_restrictable,cloud_restrictable"`
LinkMetadataTimeoutMilliseconds *int64 `access:"experimental_features,write_restrictable,cloud_restrictable"`
RestrictSystemAdmin *bool `access:"experimental_features,write_restrictable"`
UseNewSAMLLibrary *bool `access:"experimental_features,cloud_restrictable"`
@@ -961,10 +960,6 @@ func (s *ExperimentalSettings) SetDefaults() {
s.ClientSideCertCheck = NewString(ClientSideCertCheckSecondaryAuth)
}
if s.EnableClickToReply == nil {
s.EnableClickToReply = NewBool(false)
}
if s.LinkMetadataTimeoutMilliseconds == nil {
s.LinkMetadataTimeoutMilliseconds = NewInt64(ExperimentalSettingsDefaultLinkMetadataTimeoutMilliseconds)
}

Просмотреть файл

@@ -712,7 +712,6 @@ func (ts *TelemetryService) trackConfig() {
"client_side_cert_enable": *cfg.ExperimentalSettings.ClientSideCertEnable,
"isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.ClientSideCertCheckPrimaryAuth),
"link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds,
"enable_click_to_reply": *cfg.ExperimentalSettings.EnableClickToReply,
"restrict_system_admin": *cfg.ExperimentalSettings.RestrictSystemAdmin,
"use_new_saml_library": *cfg.ExperimentalSettings.UseNewSAMLLibrary,
"cloud_billing": *cfg.ExperimentalSettings.CloudBilling,