Include app package name in notification data (#52)

* Include app package name in notification message

* Use requireContext()

---------

Co-authored-by: Patrick Zwick <patri9ck@gmail.com>

Author: glmdev

app/src/main/java/dev/patri9ck/a2ln/notification/NotificationSender.java

@@ -112,6 +112,7 @@ public KeptLog sendParsedNotification(ParsedNotification parsedNotification) {
         zMsg.add(parsedNotification.getAppName());
         zMsg.add(parsedNotification.getTitle());
         zMsg.add(parsedNotification.getText());
+        zMsg.add(parsedNotification.getPackageName());
 
         parsedNotification.getIcon().ifPresent(zMsg::add);
 

app/src/main/java/dev/patri9ck/a2ln/notification/ParsedNotification.java

@@ -39,17 +39,19 @@ public class ParsedNotification {
     private final String appName;
     private final String title;
     private final String text;
+    private final String packageName;
     private final byte[] icon;
 
-    public ParsedNotification(String appName, String title, String text, byte[] icon) {
+    public ParsedNotification(String appName, String title, String text, String packageName, byte[] icon) {
         this.appName = appName;
         this.title = title;
         this.text = text;
         this.icon = icon;
+        this.packageName = packageName;
     }
 
-    public ParsedNotification(String appName, String title, String text) {
-        this(appName, title, text, null);
+    public ParsedNotification(String appName, String title, String text, String packageName) {
+        this(appName, title, text, packageName, null);
     }
 
     public static Optional<ParsedNotification> parseNotification(StatusBarNotification statusBarNotification, Context context) {
@@ -62,7 +64,8 @@ public static Optional<ParsedNotification> parseNotification(StatusBarNotificati
             return Optional.empty();
         }
 
-        String appName = Util.getAppName(context.getPackageManager(), statusBarNotification.getPackageName()).orElse("");
+        String packageName = statusBarNotification.getPackageName();
+        String appName = Util.getAppName(context.getPackageManager(), packageName).orElse("");
 
         Icon largeIcon = notification.getLargeIcon();
 
@@ -73,14 +76,14 @@ public static Optional<ParsedNotification> parseNotification(StatusBarNotificati
                 if (drawable instanceof BitmapDrawable) {
                     ((BitmapDrawable) drawable).getBitmap().compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
 
-                    return Optional.of(new ParsedNotification(appName, title, text, byteArrayOutputStream.toByteArray()));
+                    return Optional.of(new ParsedNotification(appName, title, text, packageName, byteArrayOutputStream.toByteArray()));
                 }
             } catch (IOException exception) {
                 Log.e(TAG, "Failed to convert picture to bytes", exception);
             }
         }
 
-        return Optional.of(new ParsedNotification(appName, title, text));
+        return Optional.of(new ParsedNotification(appName, title, text, packageName));
     }
 
     public String getAppName() {
@@ -95,6 +98,10 @@ public String getText() {
         return text;
     }
 
+    public String getPackageName() {
+        return packageName;
+    }
+
     public Optional<byte[]> getIcon() {
         return Optional.ofNullable(icon);
     }

app/src/main/java/dev/patri9ck/a2ln/settings/SettingsFragment.java

@@ -256,7 +256,7 @@ private void sendNotificationDirectly() {
 
             CompletableFuture.supplyAsync(() -> notificationSender.sendParsedNotification(new ParsedNotification(getString(R.string.app_name),
                     getString(R.string.notification_title),
-                    getString(R.string.notification_text)))).thenAccept(keptLog -> requireActivity().runOnUiThread(() -> succeed(keptLog.format())));
+                    getString(R.string.notification_text), requireContext().getPackageName()))).thenAccept(keptLog -> requireActivity().runOnUiThread(() -> succeed(keptLog.format())));
         });
     }