Merge branch '2983-a16-dns' into 'a16' (9c551e04) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,11 @@
		limitations under the License.
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- Private DNS -->
		<string name="private_dns_mode_cloudflare" translatable="false">Cloudflare DNS</string>
		<!-- Alternative: 1dot1dot1dot1.cloudflare-dns.com -->
		<string name="private_dns_hostname_cloudflare" translatable="false">one.one.one.one</string>

		<!-- Advanced keyboard settings -->
		<string name="keyboard_extras_title">Extras</string>
		<string name="advanced_keyboard_settings_title">Advanced settings</string>

res/values/e_strings.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -33,9 +33,6 @@
		<string name="use_ota_staging_popup_title">You are about to connect to /e/ OS test channel</string>
		<string name="use_ota_staging_popup_message">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.</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>
		@@ -78,4 +75,8 @@
		<!-- /e/ Find my device -->
		<string name="find_my_device_dashboard_title" translatable="false">Find my Device</string>
		<string name="find_my_device_dashboard_summary">Locate this device</string>

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

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
		// DNS_MODE -> RadioButton id
		private static final Map<Integer, Integer> PRIVATE_DNS_MAP;

		// Must match ConnectivitySettingsUtils
		// Only used in Settings, update on additions to ConnectivitySettingsUtils
		private static final int PRIVATE_DNS_MODE_QUADNINE = 4;

		static {
		@@ -140,6 +140,15 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
		protected void onBindDialogView(View view) {
		final Context context = getContext();
		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;
		}
		}
		mRadioGroup = view.findViewById(R.id.private_dns_radio_group);
		mRadioGroup.check(PRIVATE_DNS_MAP.getOrDefault(mMode, R.id.private_dns_mode_opportunistic));
		mRadioGroup.setOnCheckedChangeListener(this);
		@@ -258,6 +267,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
		@VisibleForTesting
		void doSaveButton() {
		Context context = getContext();
		int modeToSet = mMode;
		if (mMode == PRIVATE_DNS_MODE_PROVIDER_HOSTNAME) {
		if (mHostnameLayout == null \|\| mHostnameText == null) {
		Log.e(TAG, "Can't find hostname resources!");
		@@ -276,12 +286,17 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat

		ConnectivitySettingsManager.setPrivateDnsHostname(context,
		mHostnameText.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;
		}

		ConnectivitySettingsManager.setPrivateDnsMode(context, mMode);
		ConnectivitySettingsManager.setPrivateDnsMode(context, modeToSet);

		FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
		.action(context, SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode);
		.action(context, SettingsEnums.ACTION_PRIVATE_DNS_MODE, modeToSet);
		getDialog().dismiss();
		}
		}

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
		Settings.Global.getUriFor(PRIVATE_DNS_SPECIFIER),
		};

		// Must match ConnectivitySettingsUtils
		// Only used in Settings, update on additions to ConnectivitySettingsUtils
		private static final int PRIVATE_DNS_MODE_QUADNINE = 4;

		private final Handler mHandler;
		@@ -133,18 +133,23 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
		case PRIVATE_DNS_MODE_OFF:
		return res.getString(com.android.settingslib.R.string.private_dns_mode_off);
		case PRIVATE_DNS_MODE_QUADNINE:
		return dnsesResolved
		? res.getString(R.string.private_dns_mode_quadnine)
		: res.getString(com.android.settingslib.R.string.private_dns_mode_off);
		case PRIVATE_DNS_MODE_OPPORTUNISTIC:
		return dnsesResolved ? res.getString(R.string.private_dns_mode_on)
		: res.getString(
		com.android.settingslib.R.string.private_dns_mode_opportunistic);
		case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
		return dnsesResolved
		? ConnectivitySettingsManager.getPrivateDnsHostname(mContext)
		: res.getString(
		com.android.settingslib.R.string.private_dns_mode_off);
		if (!dnsesResolved) {
		return res.getString(
		com.android.settingslib.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 privateDnsHostname;
		}
		return "";
		}