Uplift Enable support of Unstoppable Domains and ENS via DoH on Android to 1.24.x

android/BUILD.gn

@@ -1,6 +1,6 @@
-import("//build/config/android/rules.gni")
 import("//brave/components/brave_sync/buildflags/buildflags.gni")
 import("//brave/components/p3a/buildflags.gni")
+import("//build/config/android/rules.gni")
 
 declare_args() {
   brave_android_developer_options_code = ""
@@ -9,6 +9,7 @@ declare_args() {
 java_cpp_enum("brave_android_java_enums_srcjar") {
   sources = [
     "//brave/chromium_src/chrome/browser/notifications/notification_handler.h",
+    "//brave/components/decentralized_dns/constants.h",
   ]
 }
 

android/brave_java_resources.gni

@@ -728,6 +728,8 @@ brave_java_resources = [
   "java/res/layout/ntp_widget_list_item_layout.xml",
   "java/res/layout/qa_code_check.xml",
   "java/res/layout/qa_command_line.xml",
+  "java/res/layout/radio_button_group_ens_resolve_method_preference.xml",
+  "java/res/layout/radio_button_group_unstoppable_domains_resolve_method_preference.xml",
   "java/res/layout/report_broken_site_layout.xml",
   "java/res/layout/toolbar_space.xml",
   "java/res/layout/top_sites_layout.xml",
@@ -770,9 +772,11 @@ brave_java_resources = [
   "java/res/xml/closing_all_tabs_closes_brave_preference.xml",
   "java/res/xml/desktop_mode_preferences.xml",
   "java/res/xml/developer_preferences.xml",
+  "java/res/xml/ens_preferences.xml",
   "java/res/xml/legal_information_preferences.xml",
   "java/res/xml/play_yt_video_in_browser_preferences.xml",
   "java/res/xml/qa_preferences.xml",
+  "java/res/xml/unstoppable_domains_preferences.xml",
   "java/res/xml/use_custom_tabs_brave_preference.xml",
 ]
 

android/brave_java_sources.gni

@@ -52,6 +52,10 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/ArrowColorDrawable.java",
   "../../brave/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java",
   "../../brave/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltipUtils.java",
+  "../../brave/android/java/org/chromium/chrome/browser/decentralized_dns/settings/ENSSettingsFragment.java",
+  "../../brave/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupENSResolveMethodPreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupUnstoppableDomainsResolveMethodPreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/decentralized_dns/settings/UnstoppableDomainsSettingsFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/download/BraveMimeUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java",

android/java/org/chromium/chrome/browser/decentralized_dns/settings/ENSSettingsFragment.java

@@ -0,0 +1,39 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.decentralized_dns.settings;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceFragmentCompat;
+
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+
+public class ENSSettingsFragment extends PreferenceFragmentCompat {
+    static final String PREF_ENS_RESOLVE_METHOD = "ens_resolve_method";
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+        getActivity().setTitle(R.string.ens_title);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.ens_preferences);
+
+        RadioButtonGroupENSResolveMethodPreference radioButtonGroupENSResolveMethodPreference =
+                (RadioButtonGroupENSResolveMethodPreference) findPreference(
+                        PREF_ENS_RESOLVE_METHOD);
+
+        radioButtonGroupENSResolveMethodPreference.initialize(
+                BravePrefServiceBridge.getInstance().getENSResolveMethod());
+
+        radioButtonGroupENSResolveMethodPreference.setOnPreferenceChangeListener(
+                (preference, newValue) -> {
+                    int method = (int) newValue;
+                    BravePrefServiceBridge.getInstance().setENSResolveMethod(method);
+                    return true;
+                });
+    }
+}

android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupENSResolveMethodPreference.java

@@ -0,0 +1,78 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.decentralized_dns.settings;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RadioGroup;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.decentralized_dns.ResolveMethodTypes;
+import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
+import org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class RadioButtonGroupENSResolveMethodPreference
+        extends Preference implements RadioGroup.OnCheckedChangeListener {
+    static final int OPTIONS_SIZE = ResolveMethodTypes.MAX_VALUE + 1;
+
+    private @ResolveMethodTypes int mSetting;
+    private RadioButtonWithDescription mSettingRadioButton;
+    private RadioButtonWithDescriptionLayout mGroup;
+    private ArrayList<RadioButtonWithDescription> mButtons;
+
+    public RadioButtonGroupENSResolveMethodPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.radio_button_group_ens_resolve_method_preference);
+
+        mButtons = new ArrayList<>(Collections.nCopies(OPTIONS_SIZE, null));
+    }
+
+    public void initialize(@ResolveMethodTypes int type) {
+        mSetting = type;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        mGroup = (RadioButtonWithDescriptionLayout) holder.findViewById(
+                R.id.ens_resolve_method_radio_group);
+        mGroup.setOnCheckedChangeListener(this);
+
+        mButtons.set(ResolveMethodTypes.ASK,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.ens_resolve_method_ask_radio_button));
+        mButtons.set(ResolveMethodTypes.DISABLED,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.ens_resolve_method_disabled_radio_button));
+        mButtons.set(ResolveMethodTypes.DNS_OVER_HTTPS,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.ens_resolve_method_doh_radio_button));
+
+        mSettingRadioButton = mButtons.get(mSetting);
+        mSettingRadioButton.setChecked(true);
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        for (int i = 0; i < OPTIONS_SIZE; i++) {
+            if (mButtons.get(i).isChecked()) {
+                mSetting = i;
+                mSettingRadioButton = mButtons.get(i);
+                break;
+            }
+        }
+        assert mSetting >= 0 && mSetting < OPTIONS_SIZE : "No matching setting found.";
+
+        callChangeListener(mSetting);
+    }
+}

android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupUnstoppableDomainsResolveMethodPreference.java

@@ -0,0 +1,80 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.decentralized_dns.settings;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RadioGroup;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.decentralized_dns.ResolveMethodTypes;
+import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
+import org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class RadioButtonGroupUnstoppableDomainsResolveMethodPreference
+        extends Preference implements RadioGroup.OnCheckedChangeListener {
+    static final int OPTIONS_SIZE = ResolveMethodTypes.MAX_VALUE + 1;
+
+    private @ResolveMethodTypes int mSetting;
+    private RadioButtonWithDescription mSettingRadioButton;
+    private RadioButtonWithDescriptionLayout mGroup;
+    private ArrayList<RadioButtonWithDescription> mButtons;
+
+    public RadioButtonGroupUnstoppableDomainsResolveMethodPreference(
+            Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(
+                R.layout.radio_button_group_unstoppable_domains_resolve_method_preference);
+
+        mButtons = new ArrayList<>(Collections.nCopies(OPTIONS_SIZE, null));
+    }
+
+    public void initialize(@ResolveMethodTypes int type) {
+        mSetting = type;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        mGroup = (RadioButtonWithDescriptionLayout) holder.findViewById(
+                R.id.unstoppable_domains_resolve_method_radio_group);
+        mGroup.setOnCheckedChangeListener(this);
+
+        mButtons.set(ResolveMethodTypes.ASK,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.unstoppable_domains_resolve_method_ask_radio_button));
+        mButtons.set(ResolveMethodTypes.DISABLED,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.unstoppable_domains_resolve_method_disabled_radio_button));
+        mButtons.set(ResolveMethodTypes.DNS_OVER_HTTPS,
+                (RadioButtonWithDescription) holder.findViewById(
+                        R.id.unstoppable_domains_resolve_method_doh_radio_button));
+
+        mSettingRadioButton = mButtons.get(mSetting);
+        mSettingRadioButton.setChecked(true);
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        for (int i = 0; i < OPTIONS_SIZE; i++) {
+            if (mButtons.get(i).isChecked()) {
+                mSetting = i;
+                mSettingRadioButton = mButtons.get(i);
+                break;
+            }
+        }
+        assert mSetting >= 0 && mSetting < OPTIONS_SIZE : "No matching setting found.";
+
+        callChangeListener(mSetting);
+    }
+}

android/java/org/chromium/chrome/browser/decentralized_dns/settings/UnstoppableDomainsSettingsFragment.java

@@ -0,0 +1,41 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.decentralized_dns.settings;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceFragmentCompat;
+
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+
+public class UnstoppableDomainsSettingsFragment extends PreferenceFragmentCompat {
+    static final String PREF_UNSTOPPABLE_DOMAINS_RESOLVE_METHOD =
+            "unstoppable_domains_resolve_method";
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+        getActivity().setTitle(R.string.unstoppable_domains_title);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.unstoppable_domains_preferences);
+
+        RadioButtonGroupUnstoppableDomainsResolveMethodPreference
+                radioButtonGroupUnstoppableDomainsResolveMethodPreference =
+                        (RadioButtonGroupUnstoppableDomainsResolveMethodPreference) findPreference(
+                                PREF_UNSTOPPABLE_DOMAINS_RESOLVE_METHOD);
+
+        radioButtonGroupUnstoppableDomainsResolveMethodPreference.initialize(
+                BravePrefServiceBridge.getInstance().getUnstoppableDomainsResolveMethod());
+
+        radioButtonGroupUnstoppableDomainsResolveMethodPreference.setOnPreferenceChangeListener(
+                (preference, newValue) -> {
+                    int method = (int) newValue;
+                    BravePrefServiceBridge.getInstance().setUnstoppableDomainsResolveMethod(method);
+                    return true;
+                });
+    }
+}

android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java

@@ -209,6 +209,23 @@ public void setWebrtcPolicy(int policy) {
     public int getWebrtcPolicy() {
         return BravePrefServiceBridgeJni.get().getWebrtcPolicy();
     }
+
+    public void setUnstoppableDomainsResolveMethod(int method) {
+        BravePrefServiceBridgeJni.get().setUnstoppableDomainsResolveMethod(method);
+    }
+
+    public int getUnstoppableDomainsResolveMethod() {
+        return BravePrefServiceBridgeJni.get().getUnstoppableDomainsResolveMethod();
+    }
+
+    public void setENSResolveMethod(int method) {
+        BravePrefServiceBridgeJni.get().setENSResolveMethod(method);
+    }
+
+    public int getENSResolveMethod() {
+        return BravePrefServiceBridgeJni.get().getENSResolveMethod();
+    }
+
     @NativeMethods
     interface Natives {
         void setHTTPSEEnabled(boolean enabled);
@@ -264,5 +281,10 @@ interface Natives {
 
         void setWebrtcPolicy(int policy);
         int getWebrtcPolicy();
+
+        void setUnstoppableDomainsResolveMethod(int method);
+        void setENSResolveMethod(int method);
+        int getUnstoppableDomainsResolveMethod();
+        int getENSResolveMethod();
     }
 }

android/java/res/layout/radio_button_group_ens_resolve_method_preference.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2021 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="false">
+    <org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout
+        android:id="@+id/ens_resolve_method_radio_group"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
+            android:id="@+id/ens_resolve_method_ask_radio_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_touch_target_size"
+            app:primaryText="@string/resolve_method_ask" />
+
+        <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
+            android:id="@+id/ens_resolve_method_disabled_radio_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_touch_target_size"
+            app:primaryText="@string/resolve_method_disabled" />
+
+        <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
+            android:id="@+id/ens_resolve_method_doh_radio_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_touch_target_size"
+            app:primaryText="@string/resolve_method_dns_over_https" />
+
+    </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>
+</LinearLayout>