From a2515107170c2d742341b5eda034cbabbc0d5cfd Mon Sep 17 00:00:00 2001 From: darkLord19 Date: Thu, 9 Jun 2022 01:10:30 +0530 Subject: [PATCH] remove unused code around unimplemented ExperimentalSettings.EnableClickToReply setting (#20389) --- config/client.go | 1 - model/config.go | 5 ----- services/telemetry/telemetry.go | 1 - 3 files changed, 7 deletions(-) diff --git a/config/client.go b/config/client.go index f0558047e7..dc5d97b7f6 100644 --- a/config/client.go +++ b/config/client.go @@ -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) diff --git a/model/config.go b/model/config.go index c7300e536a..741804acec 100644 --- a/model/config.go +++ b/model/config.go @@ -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) } diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 9d719ac357..aaeb3c4e47 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -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,