From 5be6f7eea1ecec765471f1e354319127fe0ac8bd Mon Sep 17 00:00:00 2001
From: cypt4 <106654560+cypt4@users.noreply.github.com>
Date: Thu, 20 Apr 2023 12:06:15 +0400
Subject: [PATCH] Fix IPFS gateway Android setting (#18042)

Resolves brave/brave-browser#29647
---
 android/BUILD.gn                                 |  2 ++
 .../settings/BravePrivacySettingsIPFSUtils.java  |  2 +-
 .../android/java/templates/BraveConfig.template  | 16 +---------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/android/BUILD.gn b/android/BUILD.gn
index ac4f5c41853..4c154b3e92c 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -3,6 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at https://mozilla.org/MPL/2.0/.
 
+import("//brave/components/ipfs/buildflags/buildflags.gni")
 import("//brave/components/p3a/buildflags.gni")
 import("//build/config/android/rules.gni")
 
@@ -23,5 +24,6 @@ java_cpp_template("brave_config_java") {
   defines = [
     "BRAVE_ANDROID_DEVELOPER_OPTIONS_CODE=\"$brave_android_developer_options_code\"",
     "BRAVE_ANDROID_P3A_ENABLED=$brave_p3a_enabled",
+    "BRAVE_ANDROID_ENABLE_IPFS=$enable_ipfs",
   ]
 }
diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java
index 06491afb74c..d23e17d2a75 100644
--- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java
+++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java
@@ -24,7 +24,7 @@ public class BravePrivacySettingsIPFSUtils {
         if (BraveConfig.IPFS_ENABLED) {
             return UserPrefs.get(Profile.getLastUsedRegularProfile())
                            .getInteger(BravePref.IPFS_RESOLVE_METHOD)
-                    == IPFSResolveMethodTypes.IPFS_ASK;
+                    != IPFSResolveMethodTypes.IPFS_DISABLED;
         } else {
             return false;
         }
diff --git a/build/android/java/templates/BraveConfig.template b/build/android/java/templates/BraveConfig.template
index 4687a14cf64..1383a0bd93e 100644
--- a/build/android/java/templates/BraveConfig.template
+++ b/build/android/java/templates/BraveConfig.template
@@ -9,21 +9,7 @@ package org.chromium.chrome.browser;
  *  Brave configuration.
  */
 public class BraveConfig {
-#if defined(BRAVE_ANDROID_DEVELOPER_OPTIONS_CODE)
   public static final String DEVELOPER_OPTIONS_CODE = BRAVE_ANDROID_DEVELOPER_OPTIONS_CODE;
-#else
-  public static final String DEVELOPER_OPTIONS_CODE = "";
-#endif
-
-#if defined(BRAVE_ANDROID_P3A_ENABLED)
   public static final boolean P3A_ENABLED = BRAVE_ANDROID_P3A_ENABLED;
-#else
-  public static final boolean P3A_ENABLED = false;
-#endif
-
-#if defined(ENABLE_IPFS)
-  public static final boolean IPFS_ENABLED = ENABLE_IPFS;
-#else
-  public static final boolean IPFS_ENABLED = false;
-#endif
+  public static final boolean IPFS_ENABLED = BRAVE_ANDROID_ENABLE_IPFS;
 }