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

Check VpnService.Builder.establish result

This commit is contained in:
M66B 2015-11-18 15:25:32 +01:00
parent 2dd8b060b2
commit caaf936bcb
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,12 +109,8 @@ public class SinkholeService extends VpnService {
vpn = startVPN(); vpn = startVPN();
startDebug(vpn); startDebug(vpn);
} }
if (vpn == null) removeDisabledNotification();
prefs.edit().putBoolean("enabled", false).apply(); Widget.updateWidgets(SinkholeService.this);
else {
removeDisabledNotification();
Widget.updateWidgets(SinkholeService.this);
}
break; break;
case reload: case reload:
@ -193,7 +189,10 @@ public class SinkholeService extends VpnService {
// Start VPN service // Start VPN service
try { try {
return builder.establish(); ParcelFileDescriptor result = builder.establish();
if (result == null)
throw new IllegalStateException("VpnService.Builder.establish returned unexpectedly NULL");
return result;
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex)); Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));