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

Simplification

This commit is contained in:
M66B 2015-11-26 08:34:33 +01:00
parent b41467bca3
commit ed893c8329
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,11 +124,6 @@ public class SinkholeService extends VpnService {
removeDisabledNotification();
Widget.updateWidgets(SinkholeService.this);
} else {
Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
ruleset.putExtra("connected", last_connected);
ruleset.putExtra("metered", last_metered);
LocalBroadcastManager.getInstance(SinkholeService.this).sendBroadcast(ruleset);
}
break;
@ -152,12 +147,7 @@ public class SinkholeService extends VpnService {
break;
case stop:
if (vpn == null) {
Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
ruleset.putExtra("connected", last_connected);
ruleset.putExtra("metered", last_metered);
LocalBroadcastManager.getInstance(SinkholeService.this).sendBroadcast(ruleset);
} else {
if (vpn != null) {
stopDebug();
stopVPN(vpn);
vpn = null;
@ -167,6 +157,12 @@ public class SinkholeService extends VpnService {
}
break;
}
Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
ruleset.putExtra("connected", last_connected);
ruleset.putExtra("metered", last_metered);
LocalBroadcastManager.getInstance(SinkholeService.this).sendBroadcast(ruleset);
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
@ -252,11 +248,6 @@ public class SinkholeService extends VpnService {
if (debug)
builder.setBlocking(true);
Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
ruleset.putExtra("connected", last_connected);
ruleset.putExtra("metered", metered);
LocalBroadcastManager.getInstance(this).sendBroadcast(ruleset);
// Start VPN service
return builder.establish();
}