mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Multi user support

This commit is contained in:
M66B 2016-01-11 11:38:48 +01:00
parent a6d4abb1a0
commit 17a590c795
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -77,6 +77,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
private static final String TAG = "NetGuard.Service"; private static final String TAG = "NetGuard.Service";
private State state = State.none; private State state = State.none;
private boolean user_foreground = true;
private boolean last_connected = false; private boolean last_connected = false;
private boolean last_metered = true; private boolean last_metered = true;
private boolean last_interactive = false; private boolean last_interactive = false;
@ -181,7 +182,8 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND); Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND);
String reason = intent.getStringExtra(EXTRA_REASON); String reason = intent.getStringExtra(EXTRA_REASON);
Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " reason=" + reason + " vpn=" + (vpn != null)); Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " reason=" + reason +
" vpn=" + (vpn != null) + " user=" + (android.os.Process.myUid() / 100000));
// Check if prepared // Check if prepared
if (cmd == Command.start || cmd == Command.reload) if (cmd == Command.start || cmd == Command.reload)
@ -190,6 +192,12 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
return; return;
} }
// Check if foreground
if (cmd != Command.stop)
if (!user_foreground) {
Log.i(TAG, "Command " + cmd + "ignored for background user");
}
// Listen for phone state changes // Listen for phone state changes
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
if (tm != null && !phone_state && if (tm != null && !phone_state &&
@ -638,8 +646,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
boolean screen = (metered ? rule.screen_other : rule.screen_wifi); boolean screen = (metered ? rule.screen_other : rule.screen_wifi);
if ((!blocked || (screen && last_interactive)) && (!metered || !(rule.roaming && roaming))) { if ((!blocked || (screen && last_interactive)) && (!metered || !(rule.roaming && roaming))) {
nAllowed++; nAllowed++;
if (Util.isDebuggable(this)) // Log.i(TAG, "Allowing " + rule.info.packageName);
Log.i(TAG, "Allowing " + rule.info.packageName);
try { try {
builder.addDisallowedApplication(rule.info.packageName); builder.addDisallowedApplication(rule.info.packageName);
} catch (PackageManager.NameNotFoundException ex) { } catch (PackageManager.NameNotFoundException ex) {
@ -782,6 +789,16 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Log.i(TAG, "Received " + intent); Log.i(TAG, "Received " + intent);
Util.logExtras(intent); Util.logExtras(intent);
user_foreground = Intent.ACTION_USER_FOREGROUND.equals(intent.getAction());
Log.i(TAG, "User foreground=" + user_foreground + " user=" + (android.os.Process.myUid() / 100000));
if (user_foreground) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
if (prefs.getBoolean("enabled", false))
start("foreground", SinkholeService.this);
} else
stop("background", SinkholeService.this);
} }
}; };
@ -955,7 +972,8 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND); Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND);
String reason = intent.getStringExtra(EXTRA_REASON); String reason = intent.getStringExtra(EXTRA_REASON);
Log.i(TAG, "Start intent=" + intent + " command=" + cmd + " reason=" + reason + " vpn=" + (vpn != null)); Log.i(TAG, "Start intent=" + intent + " command=" + cmd + " reason=" + reason +
" vpn=" + (vpn != null) + " user=" + (android.os.Process.myUid() / 100000));
// Queue command // Queue command
Message msg = mServiceHandler.obtainMessage(); Message msg = mServiceHandler.obtainMessage();