From 31249b815b8cba4c409b6d018d02d63687c54d0c Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 1 Nov 2023 07:34:02 +0100 Subject: [PATCH] Always show app titles in notifications --- app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java | 5 ++++- app/src/main/java/eu/faircode/netguard/Util.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index c0e7df59..2f1c9012 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -2391,11 +2391,14 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS public void notifyNewApplication(int uid, boolean malware) { if (uid < 0) return; + if (uid == Process.myUid()) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); try { // Get application name - String name = TextUtils.join(", ", Util.getApplicationNames(uid, this)); + List names = Util.getApplicationNames(uid, this); + String name = (names.size() == 0 ? Integer.toString(uid) : TextUtils.join(", ", names)); // Get application info PackageManager pm = getPackageManager(); diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index 1303d3f3..9fd20f93 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -410,7 +410,8 @@ public class Util { for (String pkg : pkgs) try { ApplicationInfo info = pm.getApplicationInfo(pkg, 0); - listResult.add(pm.getApplicationLabel(info).toString()); + String name = pm.getApplicationLabel(info).toString(); + listResult.add(TextUtils.isEmpty(name) ? pkg : name); } catch (PackageManager.NameNotFoundException ignored) { } Collections.sort(listResult);