Merge branch 'master' of github.com:M66B/NetGuard

This reverts commit 4a9b16ee1e.

README.md

@@ -100,7 +100,8 @@ NetGuard will try to workaround this and remove the error message when it succee
 Some LineageOS versions have a broken Android VPN implementation, causing all traffic to be blocked,
 please see [this FAQ](https://github.com/M66B/NetGuard/blob/master/FAQ.md#user-content-faq51) for more information.
 
-NetGuard is not supported on GrapheneOS and CopperheadOS because there are too often breaking changes in these custom Android versions.
+On GrapheneOS, the Android *Always-On VPN* function and the sub option '*Block connections without VPN*' are enabled by default.
+However, this sub option will result in blocking all traffic, please see [this FAQ](https://github.com/M66B/NetGuard/blob/master/FAQ.md#user-content-faq51).
 
 NetGuard is not supported for apps installed in a [work profile](https://developer.android.com/work/managed-profiles),
 or in a [Secure Folder](https://www.samsung.com/uk/support/mobile-devices/what-is-the-secure-folder-and-how-do-i-use-it/) (Samsung),

app/build.gradle

@@ -9,10 +9,10 @@ android {
 
     defaultConfig {
         applicationId = "eu.faircode.netguard"
-        versionName = "2.324"
+        versionName = "2.325"
         minSdkVersion 22
         targetSdkVersion 34
-        versionCode = 2023110201
+        versionCode = 2023110601
         archivesBaseName = "NetGuard-v$versionName"
 
         externalNativeBuild {

app/src/main/java/eu/faircode/netguard/ActivityMain.java

@@ -1049,7 +1049,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
 
             @Override
             protected List<Rule> doInBackground(Object... arg) {
-                return Rule.getRules(false, true, ActivityMain.this);
+                return Rule.getRules(false, ActivityMain.this);
             }
 
             @Override

app/src/main/java/eu/faircode/netguard/Rule.java

@@ -201,10 +201,6 @@ public class Rule {
     }
 
     public static List<Rule> getRules(final boolean all, Context context) {
-        return getRules(all, false, context);
-    }
-
-    public static List<Rule> getRules(final boolean all, boolean self, Context context) {
         synchronized (context.getApplicationContext()) {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             SharedPreferences wifi = context.getSharedPreferences("wifi", Context.MODE_PRIVATE);
@@ -344,15 +340,15 @@ public class Rule {
             for (PackageInfo info : listPI)
                 try {
                     // Skip self
-                    if (!self && info.applicationInfo.uid == Process.myUid())
+                    if (info.applicationInfo.uid == Process.myUid())
                         continue;
 
                     Rule rule = new Rule(dh, info, context);
 
                     if (pre_system.containsKey(info.packageName))
                         rule.system = pre_system.get(info.packageName);
-                    //if (info.applicationInfo.uid == Process.myUid())
-                    //    rule.system = true;
+                    if (info.applicationInfo.uid == Process.myUid())
+                        rule.system = true;
 
                     if (all ||
                             ((rule.system ? show_system : show_user) &&

app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java

@@ -1094,7 +1094,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
                 remoteViews.setTextViewText(R.id.tvMax, getString(R.string.msg_mbsec, max / 2 / 1000 / 1000));
 
             // Show session/file count
-            if (filter && loglevel > Log.WARN) {
+            if (BuildConfig.DEBUG) {
                 int[] count = jni_get_stats(jni_context);
                 remoteViews.setTextViewText(R.id.tvSessions, count[0] + "/" + count[1] + "/" + count[2]);
                 remoteViews.setTextViewText(R.id.tvFiles, count[3] + "/" + count[4]);