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

Commit 87a4156c authored by Chirayu Desai's avatar Chirayu Desai Committed by Mohammed Althaf T
Browse files

Add Quad9 DNS as a private DNS provider 

Change-Id: I7e8a320d47e7c5ddbcb9acfaf23032ae92d5d70d
parent fa06c40a

res/layout/private_dns_mode_dialog.xml

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@ 
                android:layout_marginStart="8dp"

                android:minHeight="48dp"/>



            <RadioButton

                android:id="@+id/private_dns_mode_quadnine"

                android:text="@string/private_dns_mode_quadnine"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="8dp"

                android:minHeight="48dp"/>



            <RadioButton

                android:id="@+id/private_dns_mode_opportunistic"

                android:text="@string/private_dns_mode_opportunistic"

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ 
    <!-- /e/ Sentry -->

    <string name="sentry_userid_title">Sentry User ID</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

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.network; 


import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_QUADNINE;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
@@ -73,6 +74,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
    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);

    }
@@ -211,6 +213,9 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
            case R.id.private_dns_mode_off:

                mMode = PRIVATE_DNS_MODE_OFF;

                break;

            case R.id.private_dns_mode_quadnine:

                mMode = PRIVATE_DNS_MODE_QUADNINE;

                break;

            case R.id.private_dns_mode_opportunistic:

                mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;

                break;

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

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network;



import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_QUADNINE;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;

import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
@@ -128,6 +129,10 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
        switch (mode) {

            case PRIVATE_DNS_MODE_OFF:

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

            case PRIVATE_DNS_MODE_QUADNINE:

                return dnsesResolved

                        ? res.getString(R.string.private_dns_mode_quadnine)

                        : res.getString(R.string.private_dns_mode_provider_failure);

            case PRIVATE_DNS_MODE_OPPORTUNISTIC:

                // TODO (b/79122154) : create a string specifically for this, instead of

                // hijacking a string from notifications. This is necessary at this time