Skip to content

Align lockdown troubleshooting text with actual behaviour (#743) #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasnder merged 1 commit into from
Aug 20, 2026
+4 −3
Merged

Align lockdown troubleshooting text with actual behaviour (#743) #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down