Skip to content

Respect per-app monitoring toggle when recording tracker access (#435) #644

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 2 commits into from
Jul 12, 2026
+16 −1
Merged

Respect per-app monitoring toggle when recording tracker access (#435) #644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45c59b
Respect per-app monitoring toggle when recording tracker access (#435)
kasnder Jul 12, 2026
718572d
Merge branch 'master' into claude/fix-monitoring-off-435
kasnder Jul 12, 2026
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
17 changes: 16 additions & 1 deletion app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ public class ServiceSinkhole extends VpnService {

// Cached preferences for shouldTrackApp() - refreshed in reload()
private volatile SharedPreferences cachedTrackerProtectPrefs;
private volatile SharedPreferences cachedApplyPrefs;
private volatile boolean cachedManageSystem;

private static final int NOTIFY_ENFORCING = 1;
Expand Down Expand Up @@ -615,6 +616,7 @@ private void reload(boolean interactive) {

// Refresh cached preferences for shouldTrackApp()
cachedTrackerProtectPrefs = getSharedPreferences("tracker_protect", Context.MODE_PRIVATE);
cachedApplyPrefs = getSharedPreferences("apply", Context.MODE_PRIVATE);
cachedManageSystem = prefs.getBoolean("manage_system", false);

if (state != State.enforcing) {
Expand Down Expand Up @@ -2340,7 +2342,8 @@ private Allowed isAddressAllowed(Packet packet) {
/**
* Check if tracking should be applied to this app (blocking/logging).
* Returns false if:
* - Tracker Protection (apply) is disabled for this app
* - Monitoring (apply) is disabled for this app
* - Tracker Protection (tracker_protect) is disabled for this app
* - It's a system app and manage_system is disabled
*/
private boolean shouldTrackApp(int uid) {
Expand All @@ -2363,6 +2366,18 @@ private boolean shouldTrackApp(int uid) {
uidToPackage.put(uid, packageName);
}

// Check if monitoring is enabled for this app. When monitoring is off the
// app is excluded from the VPN (addDisallowedApplication), but traffic from
// system daemons sharing this UID can still reach the tunnel, so no tracker
// access must be recorded for it either.
SharedPreferences applyPrefs = cachedApplyPrefs;
if (applyPrefs == null) {
applyPrefs = getSharedPreferences("apply", Context.MODE_PRIVATE);
}
if (!applyPrefs.getBoolean(packageName, true)) {
return false;
}

// Check if tracker protection is enabled for this app
SharedPreferences trackerProtectPrefs = cachedTrackerProtectPrefs;
if (trackerProtectPrefs == null) {
Expand Down