From 3722d48232dab4ea1b9ad904874dac5b1ce8badf Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 10 Jul 2023 12:50:28 +0530 Subject: [PATCH 1/2] Revert "Settings: Add Quad9 DNS as a private DNS provider" This reverts commit c410a61d063ce5d649838a54e2caabb77c6b5dd8. --- res/layout/private_dns_mode_dialog.xml | 4 --- res/values/cm_strings.xml | 4 --- .../PrivateDnsModeDialogPreference.java | 28 ++----------------- .../PrivateDnsPreferenceController.java | 18 ++---------- 4 files changed, 5 insertions(+), 49 deletions(-) diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml index a0580cd2ae9..12e29e693b7 100644 --- a/res/layout/private_dns_mode_dialog.xml +++ b/res/layout/private_dns_mode_dialog.xml @@ -35,10 +35,6 @@ android:id="@+id/private_dns_mode_off" layout="@layout/preference_widget_dialog_radiobutton"/> - - diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 0e630ed17a0..11213d8ea4a 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -240,8 +240,4 @@ /e/OS v%1$s - update available /e/OS v%1$s - update in progress /e/OS v%1$s - installed reboot required - - - Quad9 - dns.quad9.net diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index c157cef7828..1c3fc76dbae 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -72,13 +72,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 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); } @@ -165,15 +161,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat final ContentResolver contentResolver = context.getContentResolver(); mMode = ConnectivitySettingsManager.getPrivateDnsMode(context); - if (mMode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) { - final String privateDnsHostname = - ConnectivitySettingsManager.getPrivateDnsHostname(context); - 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); @@ -186,9 +173,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat // Initial radio button text final RadioButton offRadioButton = view.findViewById(R.id.private_dns_mode_off); offRadioButton.setText(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(R.string.private_dns_mode_opportunistic); @@ -212,21 +196,15 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_POSITIVE) { final Context context = getContext(); - int modeToSet = mMode; if (mMode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) { // Only clickable if hostname is valid, so we could save it safely ConnectivitySettingsManager.setPrivateDnsHostname(context, mEditText.getText().toString()); - } 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; } FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, - SettingsEnums.ACTION_PRIVATE_DNS_MODE, modeToSet); - ConnectivitySettingsManager.setPrivateDnsMode(context, modeToSet); + SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode); + ConnectivitySettingsManager.setPrivateDnsMode(context, mMode); } } @@ -234,8 +212,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) { diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index bed45b787bf..ed6f9ed955d 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -65,9 +65,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController Settings.Global.getUriFor(PRIVATE_DNS_SPECIFIER), }; - // Only used in Settings, update on additions to ConnectivitySettingsUtils - private static final int PRIVATE_DNS_MODE_QUADNINE = 4; - private final Handler mHandler; private final ContentObserver mSettingsObserver; private final ConnectivityManager mConnectivityManager; @@ -132,22 +129,13 @@ 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: return dnsesResolved ? res.getString(R.string.private_dns_mode_on) : 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 = - ConnectivitySettingsManager.getPrivateDnsHostname(mContext); - 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 PrivateDnsModeDialogPreference.getHostnameFromSettings(cr); + return dnsesResolved + ? PrivateDnsModeDialogPreference.getHostnameFromSettings(cr) + : res.getString(R.string.private_dns_mode_provider_failure); } return ""; } -- GitLab From e2e40d697fb7678805649c3027616bf0356a205f 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 | 4 ++++ res/values/cm_strings.xml | 3 +++ .../settings/network/PrivateDnsModeDialogPreference.java | 9 +++++++++ .../settings/network/PrivateDnsPreferenceController.java | 7 +++++++ 4 files changed, 23 insertions(+) diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml index 12e29e693b7..a0580cd2ae9 100644 --- a/res/layout/private_dns_mode_dialog.xml +++ b/res/layout/private_dns_mode_dialog.xml @@ -35,6 +35,10 @@ android:id="@+id/private_dns_mode_off" layout="@layout/preference_widget_dialog_radiobutton"/> + + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 11213d8ea4a..48133a6c83a 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -221,6 +221,9 @@ You are about to connect to /e/ OS test channel 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. + + 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 1c3fc76dbae..048ad80bc4b 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -72,9 +72,13 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat // DNS_MODE -> RadioButton id private static final Map 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); } @@ -173,6 +177,9 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat // Initial radio button text final RadioButton offRadioButton = view.findViewById(R.id.private_dns_mode_off); offRadioButton.setText(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(R.string.private_dns_mode_opportunistic); @@ -212,6 +219,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_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) { diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index ed6f9ed955d..e26ff1f9a04 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -65,6 +65,9 @@ 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; @@ -129,6 +132,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: return dnsesResolved ? res.getString(R.string.private_dns_mode_on) : res.getString(R.string.private_dns_mode_opportunistic); -- GitLab