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

Prevent loop

This commit is contained in:
M66B 2023-06-11 14:30:58 +02:00
parent db7aaa69b7
commit 5b8939720e
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -21,6 +21,7 @@ package eu.faircode.netguard;
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.ForegroundServiceStartNotAllowedException;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@ -3296,12 +3297,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
ContextCompat.startForegroundService(context, intent);
} catch (Throwable ex) {
// ForegroundServiceStartNotAllowedException
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ex instanceof ForegroundServiceStartNotAllowedException)
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
}
}
@ -3312,12 +3314,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
ContextCompat.startForegroundService(context, intent);
} catch (Throwable ex) {
// ForegroundServiceStartNotAllowedException
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ex instanceof ForegroundServiceStartNotAllowedException)
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
}
}
@ -3331,12 +3334,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
ContextCompat.startForegroundService(context, intent);
} catch (Throwable ex) {
// ForegroundServiceStartNotAllowedException
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ex instanceof ForegroundServiceStartNotAllowedException)
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
}
}
}
@ -3349,12 +3353,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
ContextCompat.startForegroundService(context, intent);
} catch (Throwable ex) {
// ForegroundServiceStartNotAllowedException
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ex instanceof ForegroundServiceStartNotAllowedException)
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
}
}
@ -3365,12 +3370,13 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
ContextCompat.startForegroundService(context, intent);
} catch (Throwable ex) {
// ForegroundServiceStartNotAllowedException
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ex instanceof ForegroundServiceStartNotAllowedException)
try {
context.startService(intent);
} catch (Throwable exex) {
Log.e(TAG, exex + "\n" + Log.getStackTraceString(exex));
}
}
}
}