Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdcf06cd authored by Nishith Khanna's avatar Nishith Khanna Committed by Nishith Khanna
Browse files

Revert "Add Quad9 DNS as a private DNS provider" 

This reverts commit 613a8cb2.
parent 6e0c388e

res/layout/private_dns_mode_dialog.xml

+0 −4
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 
                android:id="@+id/private_dns_mode_off"

                layout="@layout/preference_widget_dialog_radiobutton"/>



            <include

                android:id="@+id/private_dns_mode_quadnine"

                layout="@layout/preference_widget_dialog_radiobutton"/>



            <include

                android:id="@+id/private_dns_mode_opportunistic"

                layout="@layout/preference_widget_dialog_radiobutton"/>

res/values/e_strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
    <string name="use_ota_staging_popup_title">You are about to connect to /e/ OS test channel</string>

    <string name="use_ota_staging_popup_message">It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing.</string>



    <!-- Private DNS -->

    <string name="private_dns_mode_quadnine" translatable="false">Quad9 DNS</string>



    <!-- /e/ Telemetry -->

    <string name="enable_telemetry">Enable /e/OS Telemetry</string>

    <string name="telemetry_details">Enable automatic bug reporting</string>

src/com/android/settings/network/PrivateDnsModeDialogPreference.java

+0 −9
Original line number Diff line number Diff line
@@ -71,13 +71,9 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
    // DNS_MODE -> RadioButton id

    private static final Map<Integer, Integer> PRIVATE_DNS_MAP;



    // Must match ConnectivitySettingsUtils

    private static final int PRIVATE_DNS_MODE_QUADNINE = 4;



    static {

        PRIVATE_DNS_MAP = new HashMap<>();

        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_OFF, R.id.private_dns_mode_off);

        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_QUADNINE, R.id.private_dns_mode_quadnine);

        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_OPPORTUNISTIC, R.id.private_dns_mode_opportunistic);

        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);

    }
@@ -147,9 +143,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
        // Initial radio button text

        final RadioButton offRadioButton = view.findViewById(R.id.private_dns_mode_off);

        offRadioButton.setText(com.android.settingslib.R.string.private_dns_mode_off);

        final RadioButton quadnineRadioButton =

                view.findViewById(R.id.private_dns_mode_quadnine);

        quadnineRadioButton.setText(R.string.private_dns_mode_quadnine);

        final RadioButton opportunisticRadioButton =

                view.findViewById(R.id.private_dns_mode_opportunistic);

        opportunisticRadioButton.setText(
@@ -185,8 +178,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
    public void onCheckedChanged(RadioGroup group, int checkedId) {

        if (checkedId == R.id.private_dns_mode_off) {

            mMode = PRIVATE_DNS_MODE_OFF;

        } else if (checkedId == R.id.private_dns_mode_quadnine) {

            mMode = PRIVATE_DNS_MODE_QUADNINE;

        } else if (checkedId == R.id.private_dns_mode_opportunistic) {

            mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;

        } else if (checkedId == R.id.private_dns_mode_provider) {

src/com/android/settings/network/PrivateDnsPreferenceController.java

+1 −8
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
        Settings.Global.getUriFor(PRIVATE_DNS_SPECIFIER),

    };



    // Must match ConnectivitySettingsUtils

    private static final int PRIVATE_DNS_MODE_QUADNINE = 4;



    private final Handler mHandler;

    private final ContentObserver mSettingsObserver;

    private final ConnectivityManager mConnectivityManager;
@@ -132,10 +129,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
        switch (mode) {

            case PRIVATE_DNS_MODE_OFF:

                return res.getString(com.android.settingslib.R.string.private_dns_mode_off);

            case PRIVATE_DNS_MODE_QUADNINE:

                return dnsesResolved

                        ? res.getString(R.string.private_dns_mode_quadnine)

                        : res.getString(com.android.settingslib.R.string.private_dns_mode_off);

            case PRIVATE_DNS_MODE_OPPORTUNISTIC:

                return dnsesResolved ? res.getString(R.string.private_dns_mode_on)

                        : res.getString(
@@ -144,7 +137,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
                return dnsesResolved

                        ? ConnectivitySettingsManager.getPrivateDnsHostname(mContext)

                        : res.getString(

                                com.android.settingslib.R.string.private_dns_mode_off);

                                com.android.settingslib.R.string.private_dns_mode_provider_failure);

        }

        return "";

    }