From 76de845f3d82198f6713157856afd088c41f1d9e Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Mon, 15 Mar 2021 15:24:15 +0800 Subject: [PATCH] Connect VPN warning help icon with the network & internet page. New VpnInfoPreference created to control the presence or absence of the warning icon based on the vpn type. The VpnPreferenceController type casts the preference based on whether the provider model is enabled. It also detects legacy vpns by using the LegacyVpnProfileStore, and comparing VPN profile usernames with the active VPN config's user. Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4 Test: atest -c SettingsUnitTests Bug: Bug: 176821216 Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401 Merged-In: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401 (cherry picked from commit 7a68eb3b5e7fab5ab2a63191aa0831582178dca6) --- res/xml/network_provider_internet.xml | 2 +- .../network/VpnPreferenceController.java | 23 +++++ .../settings/vpn2/VpnInfoPreference.java | 99 +++++++++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/vpn2/VpnInfoPreference.java diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index bb7117db516..4c760aa90cc 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -98,7 +98,7 @@ android:order="10" android:fragment="com.android.settings.datausage.DataSaverSummary"/> - 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() { diff --git a/src/com/android/settings/vpn2/VpnInfoPreference.java b/src/com/android/settings/vpn2/VpnInfoPreference.java new file mode 100644 index 00000000000..cca45b54947 --- /dev/null +++ b/src/com/android/settings/vpn2/VpnInfoPreference.java @@ -0,0 +1,99 @@ +/* + * 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(); + } + } +}