Revert "Settings: Add Quad9 DNS as a private DNS provider" (3722d482) · Commits · e / os / android_packages_apps_Settings

res/layout/private_dns_mode_dialog.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -35,10 +35,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/cm_strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -240,8 +240,4 @@
		<string name="e_version_pending_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update available</string>
		<string name="e_version_in_progress_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update in progress</string>
		<string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</string>

		<!-- Private DNS -->
		<string name="private_dns_mode_quadnine" translatable="false">Quad9</string>
		<string name="private_dns_hostname_quadnine" translatable="false">dns.quad9.net</string>
		</resources>

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

+2 −26

Original line number	Diff line number	Diff line
		@@ -72,13 +72,9 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
		// DNS_MODE -> RadioButton id
		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_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) {

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

+3 −15

Original line number	Diff line number	Diff line
		@@ -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 "";
		}