rebase + refactor sumo link + PR review comments

mozilla-mobile · Jan 18, 2024 · 9d759aa · 9d759aa
1 parent 3ce04d4
commit 9d759aa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/constants.h b/src/constants.h
@@ -214,6 +214,9 @@ constexpr const char* MOZILLA_VPN_SUMO_URL =
 constexpr const char* SUMO_DNS =
     "https://support.mozilla.org/kb/how-do-i-change-my-dns-settings";
 
+constexpr const char* SUMO_EXCLUDED_APPS =
+    "https://support.mozilla.org/kb/split-tunneling-app-permissions";
+
 PRODBETAEXPR(QString, contactSupportUrl, "https://accounts.firefox.com/support",
              "https://accounts.stage.mozaws.net/support")
 

diff --git a/src/mozillavpn.cpp b/src/mozillavpn.cpp
@@ -1386,8 +1386,7 @@ void MozillaVPN::registerUrlOpenerLabels() {
                        []() -> QString { return Constants::SUMO_DNS; });
 
   uo->registerUrlLabel("sumoExcludedApps", []() -> QString {
-    return "https://support.mozilla.org/en-US/kb/"
-           "split-tunneling-app-permissions";
+    return Constants::SUMO_EXCLUDED_APPS;
   });
 }
 

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
@@ -973,10 +973,10 @@ helpSheets:
     value: What are excluded apps? 
     comment: Header label for the excluded apps help sheet
   excludedAppsBody1:
-    value: Excluded apps let you turn off VPN protection for specific apps, without turning off your device’s VPN protection.
+    value: Excluded apps let you turn off VPN protection for specific apps, without turning off VPN protection for your entire device.
     comment: Body label for the excluded apps help sheet
   excludedAppsBody2:
-    value: When you exclude an app, your IP address and approximate location will be exposed to it.
+    value: When you exclude an app, it will have access to your IP address and approximate location.
     comment: Body label for the excluded apps help sheet
   excludedAppsBody3:
     value: You can use the settings under Settings > Privacy features to block ads, block trackers, and block malware, even on excluded apps.

diff --git a/src/ui/screens/settings/appPermissions/ViewAppPermissions.qml b/src/ui/screens/settings/appPermissions/ViewAppPermissions.qml
@@ -30,7 +30,6 @@ MZViewBase {
                 onClicked: helpSheetLoader.active = true
 
                 accessibleName: MZI18n.GlobalHelp
-                Accessible.ignored: !visible
 
                 Image {
                     anchors.centerIn: parent
@@ -96,8 +95,8 @@ MZViewBase {
             model: [
                 {type: MZHelpSheet.BlockType.Title, text: MZI18n.HelpSheetsExcludedAppsHeader},
                 {type: MZHelpSheet.BlockType.Text, text: MZI18n.HelpSheetsExcludedAppsBody1, margin: 8},
-                {type: MZHelpSheet.BlockType.Text, text:MZI18n.HelpSheetsExcludedAppsBody2, margin: 16},
-                {type: MZHelpSheet.BlockType.Text, text:MZI18n.HelpSheetsExcludedAppsBody3, margin: 16},
+                {type: MZHelpSheet.BlockType.Text, text: MZI18n.HelpSheetsExcludedAppsBody2, margin: 16},
+                {type: MZHelpSheet.BlockType.Text, text: MZI18n.HelpSheetsExcludedAppsBody3, margin: 16},
                 {type: MZHelpSheet.BlockType.PrimaryButton, text: MZI18n.HelpSheetsExcludedAppsCTA, margin: 16, action: () => {
                         close()
                         getStack().push("qrc:/ui/screens/settings/privacy/ViewPrivacy.qml")