PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379 am: 42ad676a4e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551

Change-Id: Iea863ecae495cd1273c8bb77ca61ee488b147865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hansen Kurli
2023-11-21 09:30:49 +00:00
committed by Automerger Merge Worker
parent 7aeaa3f425 42ad676a4e
commit b7ba4be4b3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -6252,6 +6252,11 @@
<!-- Dialog subtitle warning for a VPN app that has an insecure type. [CHAR LIMIT=100] --> <!-- Dialog subtitle warning for a VPN app that has an insecure type. [CHAR LIMIT=100] -->
<string name="vpn_insecure_dialog_subtitle">Not secure. Update to an IKEv2 VPN</string> <string name="vpn_insecure_dialog_subtitle">Not secure. Update to an IKEv2 VPN</string>
<!-- Dialog message when user attempted to start a VPN type that is no longer supported. It is
very unlikely, but not impossible, that a user has a very old VPN configuration that the
newer device no longer supports. This message is displayed when the user tries to start
this unsupported VPN. [CHAR LIMIT=NONE] -->
<string name="vpn_start_unsupported">Failed to start unsupported VPN.</string>
<!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] --> <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
<string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string> <string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string>

4
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -209,8 +209,8 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
Toast.makeText(mContext, R.string.vpn_no_network, Toast.LENGTH_LONG).show(); Toast.makeText(mContext, R.string.vpn_no_network, Toast.LENGTH_LONG).show();
} catch (UnsupportedOperationException e) { } catch (UnsupportedOperationException e) {
Log.e(TAG, "Attempted to start an unsupported VPN type."); Log.e(TAG, "Attempted to start an unsupported VPN type.");
final AlertDialog dialog = new AlertDialog.Builder(mContext) final AlertDialog unusedDialog = new AlertDialog.Builder(mContext)
.setMessage(R.string.vpn_insecure_dialog_subtitle) .setMessage(R.string.vpn_start_unsupported)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.show(); .show();
} }