Merge "Connect VPN warning help icon with the network & internet page." into sc-dev (025301da) · Commits · e / os / android_packages_apps_Settings

res/xml/network_provider_internet.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		android:order="10"
		android:fragment="com.android.settings.datausage.DataSaverSummary"/>

		<com.android.settingslib.RestrictedPreference
		<com.android.settings.vpn2.VpnInfoPreference
		android:fragment="com.android.settings.vpn2.VpnSettings"
		android:key="vpn_settings"
		android:title="@string/vpn_settings_title"

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

+23 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.provider.SettingsSlicesContract;
		import android.security.Credentials;
		import android.security.LegacyVpnProfileStore;
		import android.util.Log;
		import android.util.SparseArray;

		@@ -36,8 +38,11 @@ import androidx.preference.PreferenceScreen;

		import com.android.internal.net.LegacyVpnInfo;
		import com.android.internal.net.VpnConfig;
		import com.android.internal.net.VpnProfile;
		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.vpn2.VpnInfoPreference;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -147,6 +152,10 @@ public class VpnPreferenceController extends AbstractPreferenceController
		} else {
		summary = getNameForVpnConfig(vpn, UserHandle.of(uid));
		}
		// Optionally add warning icon if an insecure VPN is present.
		if (Utils.isProviderModelEnabled(mContext) && mPreference instanceof VpnInfoPreference) {
		((VpnInfoPreference) mPreference).setInsecureVpn(hasInsecureVpn());
		}
		ThreadUtils.postOnMainThread(() -> mPreference.setSummary(summary));
		}

		@@ -167,6 +176,20 @@ public class VpnPreferenceController extends AbstractPreferenceController
		}
		}

		@VisibleForTesting
		protected boolean hasInsecureVpn() {
		for (String key : LegacyVpnProfileStore.list(Credentials.VPN)) {
		final VpnProfile profile = VpnProfile.decode(key,
		LegacyVpnProfileStore.get(Credentials.VPN + key));
		// Return whether any profile is an insecure type.
		if (VpnProfile.isLegacyType(profile.type)) {
		return true;
		}
		}
		// We did not find any insecure VPNs.
		return false;
		}

		// Copied from SystemUI::SecurityControllerImpl
		private final ConnectivityManager.NetworkCallback
		mNetworkCallback = new ConnectivityManager.NetworkCallback() {

src/com/android/settings/vpn2/VpnInfoPreference.java

0 → 100644

+99 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.vpn2;

		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.view.View;

		import androidx.preference.PreferenceViewHolder;

		import com.android.settings.R;
		import com.android.settingslib.HelpUtils;
		import com.android.settingslib.RestrictedPreference;


		/**
		* A preference with an Info icon on the side
		*/
		public class VpnInfoPreference extends RestrictedPreference implements View.OnClickListener {

		private boolean mIsInsecureVpn = false;
		private String mHelpUrl;

		public VpnInfoPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		mHelpUrl = context.getString(R.string.help_url_insecure_vpn);
		}

		@Override
		protected int getSecondTargetResId() {
		// Note: in the future, we will probably want to provide a configuration option
		// for this info to not be the warning color.
		return R.layout.preference_widget_warning;
		}

		@Override
		protected boolean shouldHideSecondTarget() {
		return false;
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);
		final View icon = holder.findViewById(R.id.warning_button);
		if (mIsInsecureVpn && !TextUtils.isEmpty(mHelpUrl)) {
		icon.setVisibility(View.VISIBLE);
		icon.setOnClickListener(this);
		icon.setEnabled(true);
		} else {
		icon.setVisibility(View.GONE);
		icon.setOnClickListener(this);
		icon.setEnabled(false);
		}

		// Hide the divider from view
		final View divider = holder.findViewById(R.id.two_target_divider);
		divider.setVisibility(View.GONE);
		}

		@Override
		public void onClick(View v) {
		if (v.getId() == R.id.warning_button) {
		final Intent intent = HelpUtils.getHelpIntent(
		getContext(), mHelpUrl, this.getClass().getName());

		if (intent != null) {
		((Activity) getContext()).startActivityForResult(intent, 0);
		}
		}
		}

		/**
		* Sets whether this preference corresponds to an insecure VPN. This will also affect whether
		* the warning icon appears to the user.
		*/
		public void setInsecureVpn(boolean isInsecureVpn) {
		if (mIsInsecureVpn != isInsecureVpn) {
		mIsInsecureVpn = isInsecureVpn;
		notifyChanged();
		}
		}
		}