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

Commit 2bf25777 authored by Nishith Khanna's avatar Nishith Khanna Committed by Nishith Khanna
Browse files

Replace cloudfare with quadnine as dns provider

parent 66038cda

res/layout/private_dns_mode_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
                layout="@layout/preference_widget_dialog_radiobutton"/>



            <include

                android:id="@+id/private_dns_mode_cloudflare"

                android:id="@+id/private_dns_mode_quadnine"

                layout="@layout/preference_widget_dialog_radiobutton"/>



            <include

res/values/e_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -75,4 +75,8 @@ 
    <!-- /e/ Find my device -->

    <string name="find_my_device_dashboard_title" translatable="false">Find my Device</string>

    <string name="find_my_device_dashboard_summary">Locate this device</string>



    <!-- Quad nine dns -->

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

    <string name="private_dns_hostname_quadnine" translatable="false">dns.quad9.net</string>

</resources>

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

+15 −15
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
    private static final Map<Integer, Integer> PRIVATE_DNS_MAP;



    // Only used in Settings, update on additions to ConnectivitySettingsUtils

    private static final int PRIVATE_DNS_MODE_CLOUDFLARE = 4;

    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_CLOUDFLARE, R.id.private_dns_mode_cloudflare);

        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);

    }
@@ -143,10 +143,10 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
        if (mMode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) {

            final String privateDnsHostname =

                    ConnectivitySettingsManager.getPrivateDnsHostname(context);

            final String cloudflareHostname =

                    context.getString(R.string.private_dns_hostname_cloudflare);

            if (privateDnsHostname.equals(cloudflareHostname)) {

                mMode = PRIVATE_DNS_MODE_CLOUDFLARE;

            final String quadnineHostname =

                    context.getString(R.string.private_dns_hostname_quadnine);

            if (privateDnsHostname.equals(quadnineHostname)) {

                mMode = PRIVATE_DNS_MODE_QUADNINE;

            }

        }

        mRadioGroup = view.findViewById(R.id.private_dns_radio_group);
@@ -156,9 +156,9 @@ 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 cloudflareRadioButton =

                view.findViewById(R.id.private_dns_mode_cloudflare);

        cloudflareRadioButton.setText(R.string.private_dns_mode_cloudflare);

        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(
@@ -194,8 +194,8 @@ 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_cloudflare) {

            mMode = PRIVATE_DNS_MODE_CLOUDFLARE;

        } 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) {
@@ -286,10 +286,10 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 


            ConnectivitySettingsManager.setPrivateDnsHostname(context,

                    mHostnameText.getText().toString());

        } else if (mMode == PRIVATE_DNS_MODE_CLOUDFLARE) {

            final String cloudflareHostname =

                    context.getString(R.string.private_dns_hostname_cloudflare);

            ConnectivitySettingsManager.setPrivateDnsHostname(context, cloudflareHostname);

        } else if (mMode == PRIVATE_DNS_MODE_QUADNINE) {

            final String quadnineHostname =

                    context.getString(R.string.private_dns_hostname_quadnine);

            ConnectivitySettingsManager.setPrivateDnsHostname(context, quadnineHostname);

            modeToSet = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;

        }

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

+6 −6
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
    };



    // Only used in Settings, update on additions to ConnectivitySettingsUtils

    private static final int PRIVATE_DNS_MODE_CLOUDFLARE = 4;

    private static final int PRIVATE_DNS_MODE_QUADNINE = 4;



    private final Handler mHandler;

    private final ContentObserver mSettingsObserver;
@@ -132,7 +132,7 @@ 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_CLOUDFLARE:

            case PRIVATE_DNS_MODE_QUADNINE:

            case PRIVATE_DNS_MODE_OPPORTUNISTIC:

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

                        : res.getString(
@@ -144,10 +144,10 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
                }

                final String privateDnsHostname =

                        ConnectivitySettingsManager.getPrivateDnsHostname(mContext);

                final String cloudflareHostname =

                        res.getString(R.string.private_dns_hostname_cloudflare);

                if (privateDnsHostname.equals(cloudflareHostname)) {

                    return res.getString(R.string.private_dns_mode_cloudflare);

                final String quadnineHostname =

                        res.getString(R.string.private_dns_hostname_quadnine);

                if (privateDnsHostname.equals(quadnineHostname)) {

                    return res.getString(R.string.private_dns_mode_quadnine);

                }

                return privateDnsHostname;

        }