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

Reload on in service only

This commit is contained in:
M66B 2015-12-01 17:42:38 +01:00
parent da4813881b
commit f54a8ac3b7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,14 @@ public class SinkholeService extends VpnService {
Command cmd = (Command) intent.getSerializableExtra(EXTRA_COMMAND);
Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
// Check phone state listener
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
if (!phone_state && Util.hasPhoneStatePermission(SinkholeService.this)) {
tm.listen(phoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
phone_state = true;
Log.i(TAG, "Listening to service state changes");
}
try {
switch (cmd) {
case start:
@ -395,7 +403,8 @@ public class SinkholeService extends VpnService {
public void onServiceStateChanged(ServiceState serviceState) {
super.onServiceStateChanged(serviceState);
Log.i(TAG, "Service state=" + serviceState);
reload(null, SinkholeService.this);
if (serviceState.getState() == ServiceState.STATE_IN_SERVICE)
reload(null, SinkholeService.this);
}
};
@ -442,13 +451,6 @@ public class SinkholeService extends VpnService {
ifPackage.addAction(Intent.ACTION_PACKAGE_ADDED);
ifPackage.addDataScheme("package");
registerReceiver(packageAddedReceiver, ifPackage);
if (Util.hasPhoneStatePermission(this)) {
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(phoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
phone_state = true;
Log.i(TAG, "Listening to service state changes");
}
}
@Override