mirror of https://github.com/M66B/NetGuard.git
Merge branch 'master' of https://github.com/M66B/NetGuard
This commit is contained in:
commit
9155379873
|
@ -60,6 +60,7 @@ Devices / ROMs with a broken VPN implementation:
|
||||||
|
|
||||||
* Asus™ ZenFone 2 / Android 5.0.2/5.1.1, [reported on XDA](http://forum.xda-developers.com/showpost.php?p=63619542&postcount=121) (all traffic blocked)
|
* Asus™ ZenFone 2 / Android 5.0.2/5.1.1, [reported on XDA](http://forum.xda-developers.com/showpost.php?p=63619542&postcount=121) (all traffic blocked)
|
||||||
* Asus™ ZenFone 4 / Android 5.0 (reported in the Play store) (all traffic blocked)
|
* Asus™ ZenFone 4 / Android 5.0 (reported in the Play store) (all traffic blocked)
|
||||||
|
* Asus™ ZenPad S 8.0 / Android 5.0, [reported on Github](https://github.com/M66B/NetGuard/issues/168) (all traffic blocked)
|
||||||
* BQ™ Aquaris M5 / Android 5.0 (reported in the Play store) (all traffic blocked)
|
* BQ™ Aquaris M5 / Android 5.0 (reported in the Play store) (all traffic blocked)
|
||||||
* Lenovo™ Yoga Tablet Pro-1380L / 2 Pro / Android 5.0.1, [reported on XDA](http://forum.xda-developers.com/showpost.php?p=63784102&postcount=278) (all traffic blocked)
|
* Lenovo™ Yoga Tablet Pro-1380L / 2 Pro / Android 5.0.1, [reported on XDA](http://forum.xda-developers.com/showpost.php?p=63784102&postcount=278) (all traffic blocked)
|
||||||
* Samsung™ Galaxy A5 / Android 5.0.2, [reported on Github](https://github.com/M66B/NetGuard/issues/20) (all traffic blocked)
|
* Samsung™ Galaxy A5 / Android 5.0.2, [reported on Github](https://github.com/M66B/NetGuard/issues/20) (all traffic blocked)
|
||||||
|
|
|
@ -105,13 +105,13 @@ public class SinkholeService extends VpnService {
|
||||||
Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
|
Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case start:
|
case start:
|
||||||
startForeground(NOTIFY_FOREGROUND, getForegroundNotification(0, 0));
|
|
||||||
if (vpn == null) {
|
if (vpn == null) {
|
||||||
|
startForeground(NOTIFY_FOREGROUND, getForegroundNotification(0, 0));
|
||||||
vpn = startVPN();
|
vpn = startVPN();
|
||||||
startDebug(vpn);
|
startDebug(vpn);
|
||||||
|
removeDisabledNotification();
|
||||||
|
Widget.updateWidgets(SinkholeService.this);
|
||||||
}
|
}
|
||||||
removeDisabledNotification();
|
|
||||||
Widget.updateWidgets(SinkholeService.this);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case reload:
|
case reload:
|
||||||
|
@ -129,10 +129,10 @@ public class SinkholeService extends VpnService {
|
||||||
stopDebug();
|
stopDebug();
|
||||||
stopVPN(vpn);
|
stopVPN(vpn);
|
||||||
vpn = null;
|
vpn = null;
|
||||||
|
stopForeground(true);
|
||||||
|
Widget.updateWidgets(SinkholeService.this);
|
||||||
|
// Don't call stopSelf, since a start can follow
|
||||||
}
|
}
|
||||||
stopForeground(true);
|
|
||||||
Widget.updateWidgets(SinkholeService.this);
|
|
||||||
// stopSelf();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue