Merge branch '1284-q-quad9' into 'v1-q' (c94b2637) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+3 −4

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>
		@@ -230,8 +233,4 @@
		<!-- Advanced Privacy -->
		<string name="advanced_privacy_dashboard_title" translatable="false">Advanced Privacy</string>
		<string name="advanced_privacy_dashboard_summary">Manage trackers, fake location, hide IP address</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

+3 −20

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;

		@@ -70,9 +71,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
		// DNS_MODE -> RadioButton id
		private static final Map<String, Integer> 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);
		@@ -171,14 +169,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 +195,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);
		}
		}

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

+7 −14

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;
		@@ -64,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 String PRIVATE_DNS_MODE_QUADNINE = "quadnine";

		private final Handler mHandler;
		private final ContentObserver mSettingsObserver;
		private final ConnectivityManager mConnectivityManager;
		@@ -132,6 +130,9 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
		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
		@@ -140,17 +141,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 "";
		}