From eecc97a339f61a60ad2f2dc30de3b05a3467ef9d Mon Sep 17 00:00:00 2001
From: Jeremy Goldman <goldmanj@google.com>
Date: Wed, 14 Apr 2021 11:52:38 +0800
Subject: [PATCH] Add additional strings to differentiate between single and
 multiple insecure vpns

Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.

Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
---
 res/values/strings.xml                                     | 6 ++++--
 .../android/settings/network/VpnPreferenceController.java  | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 741e75da3c2..e13dc48ec35 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6508,8 +6508,10 @@
     <string name="vpn_settings_title">VPN</string>
     <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->
     <string name="vpn_settings_insecure_single">Not secure</string>
-    <!-- Title of preference to enter the VPN settings activity [CHAR LIMIT=30] -->
-    <string name="vpn_settings_insecure_multiple"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>
+    <!-- Title of preference to enter the VPN settings activity, if there are multiple vpns but only 1 insecure vpn [CHAR LIMIT=60] -->
+    <string name="vpn_settings_single_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>
+    <!-- Title of preference to enter the VPN settings activity, if there are multiple vpns and multiple insecure vpns [CHAR LIMIT=60] -->
+    <string name="vpn_settings_multiple_insecure_multiple_total"><xliff:g id="vpn_count" example="1">%d</xliff:g> not secure</string>
 
     <!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] -->
     <string name="adaptive_connectivity_title">Adaptive connectivity</string>
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 0bec7ac2dd7..4944f4380a2 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -169,9 +169,14 @@ public class VpnPreferenceController extends AbstractPreferenceController
                         - connectedLegacyVpnCount;
                 if (vpnCount == 1) {
                     summary = mContext.getString(R.string.vpn_settings_insecure_single);
+                } else if (insecureVpnCount == 1) {
+                    summary = mContext.getString(
+                            R.string.vpn_settings_single_insecure_multiple_total,
+                            insecureVpnCount);
                 } else {
                     summary = mContext.getString(
-                            R.string.vpn_settings_insecure_multiple, insecureVpnCount);
+                            R.string.vpn_settings_multiple_insecure_multiple_total,
+                            insecureVpnCount);
                 }
             }
         }