Merge "DNSLink" and "Redirect gateway-like resouces" settings into th…

…e one Resolves brave/brave-browser#31097
brave · Jun 27, 2023 · 870aa10 · 870aa10
1 parent f1f7e4b
commit 870aa10
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 73 deletions.
diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp
@@ -1259,19 +1259,13 @@
   <message name="IDS_SETTINGS_IPFS_AUTO_FALLBACK_TO_GATEWAY_DESC" desc="The description for the switch of automatically fallback to IPFS public gateway">
     Automatically fall back to public IPFS gateway if your Brave local IPFS node cannot be reached.
   </message>
-  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_GATEWAY_LABEL" desc="The text label for redirecting IPFS resources to the configured gateway">
-    Redirect IPFS resources to the configured IPFS gateway
+  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_TO_GATEWAY_WHEN_POSSIBLE_LABEL">
+    Automatically redirect resources available on IPFS network to the configured gateway.
   </message>
-  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_GATEWAY_DESC" desc="The description for redirecting IPFS resources to the configured gateway">
-    Requests to IPFS resources, hosted on third-party IPFS gateways will be loaded via selected local or remote gateway.
+  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_TO_GATEWAY_WHEN_POSSIBLE_DESC">
+    Requests to IPFS resources, hosted on third-party IPFS gateways or DNSLINK resources will be loaded via selected local or remote gateway.
     Note: If local node is selected, resource will be requested directly from your computer and cached data may be provided to the IPFS network for some time.
   </message>
-  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_DNSLINK_RESOURCES_LABEL" desc="The text label for redirecting IPFS resources for DNSLink">
-    Automatically redirect to IPFS pages via DNSLink when possible
-  </message>
-  <message name="IDS_SETTINGS_IPFS_AUTO_REDIRECT_DNSLINK_RESOURCES_DESC" desc="The description for redirecting IPFS resources for DNSLink">
-    Automatically uses DNSLink to navigate to an IPFS version of a website when possible
-  </message>
   <message name="IDS_SETTINGS_IPFS_COMPANION_ENABLED_DESC" desc="The description for IPFS companion switch in settings">
     Uses the IPFS Companion extension for enhanced IPFS support in Brave, including access to common IPFS tasks from your browser bar.
   </message>

diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc
@@ -111,7 +111,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
                   ->GetFilePath(kIPFSBinaryPath)
                   .empty());
   EXPECT_FALSE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(
-      kIPFSAutoRedirectGateway));
+      kIPFSAutoRedirectToConfiguredGateway));
 #endif
   EXPECT_FALSE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean(
       kIPFSCompanionEnabled));

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -259,9 +259,7 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_STRING;
   (*s_brave_allowlist)[kIPFSPublicNFTGatewayAddress] =
       settings_api::PrefType::PREF_TYPE_STRING;
-  (*s_brave_allowlist)[kIPFSAutoRedirectGateway] =
-      settings_api::PrefType::PREF_TYPE_BOOLEAN;
-  (*s_brave_allowlist)[kIPFSAutoRedirectDNSLink] =
+  (*s_brave_allowlist)[kIPFSAutoRedirectToConfiguredGateway] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kIpfsStorageMax] =
       settings_api::PrefType::PREF_TYPE_NUMBER;

diff --git a/browser/ipfs/ipfs_tab_helper.cc b/browser/ipfs/ipfs_tab_helper.cc
@@ -104,8 +104,7 @@ void IPFSTabHelper::DNSLinkResolved(const GURL& ipfs, bool is_gateway_url) {
   DCHECK(!ipfs.is_valid() || ipfs.SchemeIs(kIPNSScheme));
   ipfs_resolved_url_ = ipfs.is_valid() ? ipfs : GURL();
   bool should_redirect =
-      (is_gateway_url && pref_service_->GetBoolean(kIPFSAutoRedirectGateway)) ||
-      (!is_gateway_url && pref_service_->GetBoolean(kIPFSAutoRedirectDNSLink));
+      pref_service_->GetBoolean(kIPFSAutoRedirectToConfiguredGateway);
   if (ipfs.is_valid() && should_redirect) {
     LoadUrl(GetIPFSResolvedURL());
     return;
@@ -207,7 +206,7 @@ bool IPFSTabHelper::IsAutoRedirectIPFSResourcesEnabled() const {
   auto resolve_method = static_cast<ipfs::IPFSResolveMethodTypes>(
       pref_service_->GetInteger(kIPFSResolveMethod));
   auto autoredirect_ipfs_resources_enabled =
-      pref_service_->GetBoolean(kIPFSAutoRedirectGateway);
+      pref_service_->GetBoolean(kIPFSAutoRedirectToConfiguredGateway);
 
   return (resolve_method != ipfs::IPFSResolveMethodTypes::IPFS_DISABLED) &&
          autoredirect_ipfs_resources_enabled;

diff --git a/browser/ipfs/ipfs_tab_helper_browsertest.cc b/browser/ipfs/ipfs_tab_helper_browsertest.cc
@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(IpfsTabHelperBrowserTest,
   auto* prefs =
       user_prefs::UserPrefs::Get(active_contents()->GetBrowserContext());
 
-  prefs->SetBoolean(kIPFSAutoRedirectGateway, true);
+  prefs->SetBoolean(kIPFSAutoRedirectToConfiguredGateway, true);
   prefs->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(IpfsTabHelperBrowserTest, GatewayRedirectToIPFS) {
   auto* prefs =
       user_prefs::UserPrefs::Get(active_contents()->GetBrowserContext());
 
-  prefs->SetBoolean(kIPFSAutoRedirectGateway, true);
+  prefs->SetBoolean(kIPFSAutoRedirectToConfiguredGateway, true);
   prefs->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -379,7 +379,7 @@ IN_PROC_BROWSER_TEST_F(IpfsTabHelperBrowserTest,
   auto* prefs =
       user_prefs::UserPrefs::Get(active_contents()->GetBrowserContext());
 
-  prefs->SetBoolean(kIPFSAutoRedirectGateway, true);
+  prefs->SetBoolean(kIPFSAutoRedirectToConfiguredGateway, true);
   prefs->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -429,7 +429,7 @@ IN_PROC_BROWSER_TEST_F(IpfsTabHelperBrowserTest, GatewayRedirectToIPNS) {
   auto* prefs =
       user_prefs::UserPrefs::Get(active_contents()->GetBrowserContext());
 
-  prefs->SetBoolean(kIPFSAutoRedirectGateway, true);
+  prefs->SetBoolean(kIPFSAutoRedirectToConfiguredGateway, true);
   prefs->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -581,7 +581,7 @@ IN_PROC_BROWSER_TEST_F(IpfsTabHelperBrowserTest,
   auto* prefs =
       user_prefs::UserPrefs::Get(active_contents()->GetBrowserContext());
 
-  prefs->SetBoolean(kIPFSAutoRedirectDNSLink, true);
+  prefs->SetBoolean(kIPFSAutoRedirectToConfiguredGateway, true);
   prefs->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));

diff --git a/browser/ipfs/ipfs_tab_helper_unittest.cc b/browser/ipfs/ipfs_tab_helper_unittest.cc
@@ -77,11 +77,10 @@ class IpfsTabHelperUnitTest : public testing::Test {
     profile_->GetPrefs()->SetInteger(kIPFSResolveMethod,
                                      static_cast<int>(type));
   }
-  void SetAutoRedirectDNSLink(bool value) {
-    profile_->GetPrefs()->SetBoolean(kIPFSAutoRedirectDNSLink, value);
-  }
-  void SetAutoRedirecIPFSResources(bool value) {
-    profile_->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, value);
+
+  void SetAutoRedirectToConfiguredGateway(bool value) {
+    profile_->GetPrefs()->SetBoolean(kIPFSAutoRedirectToConfiguredGateway,
+                                     value);
   }
 
   ipfs::IPFSTabHelper* ipfs_tab_helper() {
@@ -349,7 +348,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayLikeUrlParsed_AutoRedirectEnabled) {
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
 
-  SetAutoRedirecIPFSResources(true);
+  SetAutoRedirectToConfiguredGateway(true);
 
   {
     ResetRedirectUrl();
@@ -422,7 +421,7 @@ TEST_F(IpfsTabHelperUnitTest,
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
 
-  SetAutoRedirecIPFSResources(true);
+  SetAutoRedirectToConfiguredGateway(true);
 
   {
     ResetRedirectUrl();
@@ -457,7 +456,7 @@ TEST_F(IpfsTabHelperUnitTest,
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
 
-  SetAutoRedirecIPFSResources(true);
+  SetAutoRedirectToConfiguredGateway(true);
 
   {
     ResetRedirectUrl();
@@ -478,7 +477,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayLikeUrlParsed_AutoRedirectDisabled) {
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
 
-  SetAutoRedirecIPFSResources(false);
+  SetAutoRedirectToConfiguredGateway(false);
 
   {
     SetIPFSResolveMethodPref(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY);
@@ -513,8 +512,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_ResolveUrl) {
 }
 
 TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_Redirect) {
-  SetAutoRedirecIPFSResources(true);
-  SetAutoRedirectDNSLink(false);
+  SetAutoRedirectToConfiguredGateway(true);
 
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
@@ -533,8 +531,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_Redirect) {
 }
 
 TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_No_Redirect_WhenNoDnsLink) {
-  SetAutoRedirecIPFSResources(true);
-  SetAutoRedirectDNSLink(false);
+  SetAutoRedirectToConfiguredGateway(true);
 
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
@@ -553,8 +550,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_No_Redirect_WhenNoDnsLink) {
 }
 
 TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_Redirect_LibP2PKey) {
-  SetAutoRedirecIPFSResources(true);
-  SetAutoRedirectDNSLink(false);
+  SetAutoRedirectToConfiguredGateway(true);
 
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);
@@ -576,8 +572,7 @@ TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_Redirect_LibP2PKey) {
 }
 
 TEST_F(IpfsTabHelperUnitTest, GatewayIPNS_Redirect_LibP2PKey_NoAutoRedirect) {
-  SetAutoRedirecIPFSResources(false);
-  SetAutoRedirectDNSLink(false);
+  SetAutoRedirectToConfiguredGateway(false);
 
   auto* helper = ipfs_tab_helper();
   ASSERT_TRUE(helper);

diff --git a/browser/ipfs/test/ipfs_service_browsertest.cc b/browser/ipfs/test/ipfs_service_browsertest.cc
@@ -1078,7 +1078,8 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest,
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, false);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, false);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1101,7 +1102,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_DISABLED));
@@ -1124,7 +1126,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1152,7 +1155,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1175,7 +1179,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1199,7 +1204,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandleEmbeddedSrvrRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1231,7 +1237,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_GATEWAY));
@@ -1260,7 +1267,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_ASK));
@@ -1287,7 +1295,8 @@ IN_PROC_BROWSER_TEST_F(
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_ASK));
@@ -1312,7 +1321,8 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest,
   ResetTestServer(
       base::BindRepeating(&IpfsServiceBrowserTest::HandlePublicGatewayRequest,
                           base::Unretained(this)));
-  browser()->profile()->GetPrefs()->SetBoolean(kIPFSAutoRedirectGateway, true);
+  browser()->profile()->GetPrefs()->SetBoolean(
+      kIPFSAutoRedirectToConfiguredGateway, true);
   browser()->profile()->GetPrefs()->SetInteger(
       kIPFSResolveMethod,
       static_cast<int>(ipfs::IPFSResolveMethodTypes::IPFS_ASK));
@@ -1670,4 +1680,24 @@ IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, DNSResolversConfig) {
   }
 }
 
+IN_PROC_BROWSER_TEST_F(IpfsServiceBrowserTest, MigrateProfilePrefs) {
+  auto* prefs = browser()->profile()->GetPrefs();
+  {
+    prefs->ClearPref(kIPFSAutoRedirectToConfiguredGateway);
+    prefs->SetBoolean(kIPFSAutoRedirectDNSLink, true);
+    prefs->SetBoolean(kIPFSAutoRedirectGateway, false);
+
+    ipfs::IpfsService::MigrateProfilePrefs(prefs);
+    EXPECT_TRUE(prefs->GetBoolean(kIPFSAutoRedirectToConfiguredGateway));
+  }
+  {
+    prefs->ClearPref(kIPFSAutoRedirectToConfiguredGateway);
+    prefs->SetBoolean(kIPFSAutoRedirectDNSLink, false);
+    prefs->SetBoolean(kIPFSAutoRedirectGateway, true);
+
+    ipfs::IpfsService::MigrateProfilePrefs(prefs);
+    EXPECT_TRUE(prefs->GetBoolean(kIPFSAutoRedirectToConfiguredGateway));
+  }
+}
+
 }  // namespace ipfs
diff --git a/browser/profiles/brave_profile_manager.cc b/browser/profiles/brave_profile_manager.cc
@@ -49,6 +49,7 @@
 
 #if BUILDFLAG(ENABLE_IPFS)
 #include "brave/browser/ipfs/ipfs_service_factory.h"
+#include "brave/components/ipfs/ipfs_service.h"
 #endif  // BUILDFLAG(ENABLE_IPFS)
 
 #if BUILDFLAG(ENABLE_TOR)
@@ -94,6 +95,9 @@ void BraveProfileManager::InitProfileUserPrefs(Profile* profile) {
   brave::SetDefaultThirdPartyCookieBlockValue(profile);
   perf::MaybeEnableBraveFeatureForPerfTesting(profile);
   brave::MigrateHttpsUpgradeSettings(profile);
+#if BUILDFLAG(ENABLE_IPFS)
+  ipfs::IpfsService::MigrateProfilePrefs(profile->GetPrefs());
+#endif
 }
 
 void BraveProfileManager::DoFinalInitForServices(Profile* profile,

diff --git a/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html b/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html
@@ -64,18 +64,11 @@
         label="$i18n{ipfsAutoFallbackToGatewayLabel}"
         sub-label="$i18n{ipfsAutoFallbackToGatewayDesc}">
     </settings-toggle-button>
-    <settings-toggle-button id="ipfsAutoRedirectGateway"
+    <settings-toggle-button id="ipfsAutoRedirectToConfiguredGateway"
       class="cr-row"
-      pref="{{prefs.brave.ipfs.auto_redirect_gateway}}"
-      label="$i18n{ipfsAutoRedirectGatewayLabel}"
-      sub-label="$i18n{ipfsAutoRedirectGatewayDesc}">
-    </settings-toggle-button>
-    <settings-toggle-button id="ipfsAutoRedirectDNSLink"
-      class="cr-row"
-      pref="{{prefs.brave.ipfs.auto_redirect_dnslink}}"
-      label="$i18n{ipfsAutoRedirectDNSLinkLabel}"
-      sub-label="$i18n{ipfsAutoRedirectDNSLinkDesc}"
-      learn-more-url="$i18n{ipfsDNSLinkLearnMoreURL}">
+      pref="{{prefs.brave.ipfs.auto_redirect_to_configured_gateway}}"
+      label="$i18n{ipfsAutoRedirectToGatewayWhenPossibleLabel}"
+      sub-label="$i18n{ipfsAutoRedirectToGatewayWhenPossibleDesc}">
     </settings-toggle-button>
 
     <settings-toggle-button id="ipfsCompanionEnabled"

diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc
@@ -427,14 +427,10 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_IPFS_AUTO_FALLBACK_TO_GATEWAY_LABEL},
     {"ipfsAutoFallbackToGatewayDesc",
      IDS_SETTINGS_IPFS_AUTO_FALLBACK_TO_GATEWAY_DESC},
-    {"ipfsAutoRedirectGatewayLabel",
-     IDS_SETTINGS_IPFS_AUTO_REDIRECT_GATEWAY_LABEL},
-    {"ipfsAutoRedirectGatewayDesc",
-     IDS_SETTINGS_IPFS_AUTO_REDIRECT_GATEWAY_DESC},
-    {"ipfsAutoRedirectDNSLinkLabel",
-     IDS_SETTINGS_IPFS_AUTO_REDIRECT_DNSLINK_RESOURCES_LABEL},
-    {"ipfsAutoRedirectDNSLinkDesc",
-     IDS_SETTINGS_IPFS_AUTO_REDIRECT_DNSLINK_RESOURCES_DESC},
+    {"ipfsAutoRedirectToGatewayWhenPossibleLabel",
+     IDS_SETTINGS_IPFS_AUTO_REDIRECT_TO_GATEWAY_WHEN_POSSIBLE_LABEL},
+    {"ipfsAutoRedirectToGatewayWhenPossibleDesc",
+     IDS_SETTINGS_IPFS_AUTO_REDIRECT_TO_GATEWAY_WHEN_POSSIBLE_DESC},
     {"ipfsCompanionEnabledDesc", IDS_SETTINGS_IPFS_COMPANION_ENABLED_DESC},
     {"torEnabledLabel", IDS_SETTINGS_ENABLE_TOR_TITLE},
     {"torEnabledDesc", IDS_SETTINGS_ENABLE_TOR_DESC},