From fa06c40afb49536b4dc8f3becf8bceb7a85fdfea Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 10 Jul 2023 14:03:32 +0530 Subject: [PATCH 1/2] Revert "Settings: Add Quad9 DNS as a private DNS provider" This reverts commit d095dfe8cea5e75e002d24202f8f70979abbdbe7. --- res/layout/private_dns_mode_dialog.xml | 8 ------ res/values/cm_strings.xml | 4 --- .../PrivateDnsModeDialogPreference.java | 26 ++----------------- .../PrivateDnsPreferenceController.java | 18 +++---------- 4 files changed, 5 insertions(+), 51 deletions(-) diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml index 121d735b744..641905dc010 100644 --- a/res/layout/private_dns_mode_dialog.xml +++ b/res/layout/private_dns_mode_dialog.xml @@ -38,14 +38,6 @@ android:layout_marginStart="8dp" android:minHeight="48dp"/> - - Advanced Privacy Manage trackers, fake location, hide IP address - - - Quad9 - dns.quad9.net diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index ae6bd45672d..1655c69cea4 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -70,13 +70,9 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat // DNS_MODE -> RadioButton id private static final Map PRIVATE_DNS_MAP; - // Only used in Settings, update on additions to ConnectivitySettingsUtils - private static final String PRIVATE_DNS_MODE_QUADNINE = "quadnine"; - 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); } @@ -171,14 +167,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat final ContentResolver contentResolver = context.getContentResolver(); mMode = getModeFromSettings(context.getContentResolver()); - if (mMode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) { - final String privateDnsHostname = getHostnameFromSettings(contentResolver); - final String quadNineHostname = - context.getString(R.string.private_dns_hostname_quadnine); - if (privateDnsHostname.equals(quadNineHostname)) { - mMode = PRIVATE_DNS_MODE_QUADNINE; - } - } mEditText = view.findViewById(R.id.private_dns_mode_provider_hostname); mEditText.addTextChangedListener(this); @@ -205,22 +193,15 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_POSITIVE) { final Context context = getContext(); - String modeToSet = mMode; if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) { // Only clickable if hostname is valid, so we could save it safely Settings.Global.putString(context.getContentResolver(), HOSTNAME_KEY, mEditText.getText().toString()); - } else if (mMode == PRIVATE_DNS_MODE_QUADNINE) { - final String quadNineHostname = - context.getString(R.string.private_dns_hostname_quadnine); - Settings.Global.putString(context.getContentResolver(), HOSTNAME_KEY, - quadNineHostname); - modeToSet = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; } FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, - SettingsEnums.ACTION_PRIVATE_DNS_MODE, modeToSet); - Settings.Global.putString(context.getContentResolver(), MODE_KEY, modeToSet); + SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode); + Settings.Global.putString(context.getContentResolver(), MODE_KEY, mMode); } } @@ -230,9 +211,6 @@ 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; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 05205663d23..b74345170c0 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -64,9 +64,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController Settings.Global.getUriFor(PRIVATE_DNS_SPECIFIER), }; - // Only used in Settings, update on additions to ConnectivitySettingsUtils - private static final String PRIVATE_DNS_MODE_QUADNINE = "quadnine"; - private final Handler mHandler; private final ContentObserver mSettingsObserver; private final ConnectivityManager mConnectivityManager; @@ -131,7 +128,6 @@ 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: 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 @@ -140,17 +136,9 @@ public class PrivateDnsPreferenceController extends BasePreferenceController return dnsesResolved ? res.getString(R.string.switch_on_text) : res.getString(R.string.private_dns_mode_opportunistic); case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME: - if (!dnsesResolved) { - return res.getString(R.string.private_dns_mode_provider_failure); - } - final String privateDnsHostname = - PrivateDnsModeDialogPreference.getHostnameFromSettings(cr); - 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; + return dnsesResolved + ? PrivateDnsModeDialogPreference.getHostnameFromSettings(cr) + : res.getString(R.string.private_dns_mode_provider_failure); } return ""; } -- GitLab From 87a4156c900c053f9de00149d4d78b269c75e658 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 24 Jun 2019 21:27:26 +0530 Subject: [PATCH 2/2] Add Quad9 DNS as a private DNS provider Change-Id: I7e8a320d47e7c5ddbcb9acfaf23032ae92d5d70d --- res/layout/private_dns_mode_dialog.xml | 8 ++++++++ res/values/cm_strings.xml | 3 +++ .../settings/network/PrivateDnsModeDialogPreference.java | 5 +++++ .../settings/network/PrivateDnsPreferenceController.java | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml index 641905dc010..121d735b744 100644 --- a/res/layout/private_dns_mode_dialog.xml +++ b/res/layout/private_dns_mode_dialog.xml @@ -38,6 +38,14 @@ android:layout_marginStart="8dp" android:minHeight="48dp"/> + + Sentry User ID + + Quad9 DNS + Enable /e/OS Telemetry Enable automatic bug reporting diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 1655c69cea4..362c003c1db 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -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; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index b74345170c0..2d00711fde3 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -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 -- GitLab