From 57213708cb2eee677bd4c1bbff73bcdf3c858762 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 20 Aug 2026 22:07:09 +0000
Subject: [PATCH] Align lockdown troubleshooting text with actual behaviour
 (#743)

Remove the promise of a lockdown-detection notification from
troubleshooting_alwayson_desc: no such notification is ever posted, and
on Android S+ the condition cannot be detected by non-system apps at all.

Drop the unreferenced title_lockdown_enabled string, and document in
ActivityMain that the enable-time lockdown check is deliberately limited
to pre-S devices, with onboarding and the troubleshooting page as the
only S+ coverage.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GTx9x5FNwfkVpNfJmWiqWT
---
 app/src/main/java/eu/faircode/netguard/ActivityMain.java | 4 +++-
 app/src/main/res/values/strings.xml                      | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
index f3ea778d..aa6b0839 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
@@ -292,7 +292,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
                 if (isChecked) {
                     // Check always-on VPN settings only on Android < S (API 31)
-                    // From Android S+, these settings keys are restricted to system apps
+                    // From Android S+, these settings keys are restricted to system apps,
+                    // so lockdown cannot be detected there; coverage on S+ is limited to
+                    // the onboarding slide and the troubleshooting page (deliberate, see #743)
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
                         try {
                             String alwaysOn = Settings.Secure.getString(getContentResolver(), "always_on_vpn_app");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87e15a8b..f4ccf82e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <string name="troubleshooting_categories_desc">You can fine-tune blocking for each app by tapping it and toggling individual tracker categories (e.g. Analytics, Ads) on or off in the Trackers tab.</string>
 
     <string name="troubleshooting_alwayson_title">Always-on VPN</string>
-    <string name="troubleshooting_alwayson_desc">If \"Block connections without VPN\" (lockdown) is enabled in Android VPN settings, TrackerControl cannot work correctly. Disable this option. A notification will appear if this is detected.</string>
+    <string name="troubleshooting_alwayson_desc">If \"Block connections without VPN\" (lockdown) is enabled in Android VPN settings, TrackerControl cannot work correctly. Disable this option.</string>
     <string name="troubleshooting_alwayson_action">Open VPN settings</string>
     <string name="menu_apps">Other apps</string>
 
@@ -388,7 +388,6 @@ Your internet traffic is not being sent to a remote VPN server.</string>
     <string name="title_ruid">Destination app</string>
     <string name="title_external">For an external server select \'nobody\'</string>
 
-    <string name="title_lockdown_enabled">Traffic is locked down</string>
     <string name="title_unmetered_allowed">Unmetered traffic is allowed</string>
     <string name="title_unmetered_blocked">Unmetered traffic is blocked</string>
     <string name="title_unmetered_disabled">Unmetered rules are not applied</string>