From b0e46cd9046e3adba4c2afb2a36f9af2eb216aa9 Mon Sep 17 00:00:00 2001
From: rebelonion <87634197+rebelonion@users.noreply.github.com>
Date: Sun, 17 Mar 2024 17:56:53 -0500
Subject: [PATCH] fix: all notifications going to the same activity

---
 .../dantotsu/notifications/CommentNotificationWorker.kt  | 9 ++++++---
 .../notifications/anilist/AnilistNotificationWorker.kt   | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/notifications/CommentNotificationWorker.kt b/app/src/main/java/ani/dantotsu/notifications/CommentNotificationWorker.kt
index 7f0d6d5e..f07e169a 100644
--- a/app/src/main/java/ani/dantotsu/notifications/CommentNotificationWorker.kt
+++ b/app/src/main/java/ani/dantotsu/notifications/CommentNotificationWorker.kt
@@ -20,6 +20,7 @@ import ani.dantotsu.R
 import ani.dantotsu.connections.comments.CommentsAPI
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
+import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -152,6 +153,8 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
         color: String,
         imageUrl: String
     ): android.app.Notification? {
+        Logger.log("Creating notification of type $notificationType" +
+                ", message: $message, title: $title, mediaId: $mediaId, commentId: $commentId")
         val notification = when (notificationType) {
             NotificationType.COMMENT_WARNING -> {
                 val intent = Intent(applicationContext, MainActivity::class.java).apply {
@@ -162,7 +165,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
                 }
                 val pendingIntent = PendingIntent.getActivity(
                     applicationContext,
-                    0,
+                    commentId,
                     intent,
                     PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                 )
@@ -185,7 +188,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
                 }
                 val pendingIntent = PendingIntent.getActivity(
                     applicationContext,
-                    0,
+                    commentId,
                     intent,
                     PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                 )
@@ -214,7 +217,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
                 }
                 val pendingIntent = PendingIntent.getActivity(
                     applicationContext,
-                    0,
+                    System.currentTimeMillis().toInt(),
                     intent,
                     PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                 )
diff --git a/app/src/main/java/ani/dantotsu/notifications/anilist/AnilistNotificationWorker.kt b/app/src/main/java/ani/dantotsu/notifications/anilist/AnilistNotificationWorker.kt
index eb7d776c..50a9befb 100644
--- a/app/src/main/java/ani/dantotsu/notifications/anilist/AnilistNotificationWorker.kt
+++ b/app/src/main/java/ani/dantotsu/notifications/anilist/AnilistNotificationWorker.kt
@@ -16,6 +16,7 @@ import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.profile.activity.ActivityItemBuilder
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
+import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -78,12 +79,13 @@ class AnilistNotificationWorker(appContext: Context, workerParams: WorkerParamet
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
             if (notificationId != null) {
+                Logger.log("notificationId: $notificationId")
                 putExtra("activityId", notificationId)
             }
         }
         val pendingIntent = PendingIntent.getActivity(
             applicationContext,
-            0,
+            notificationId ?: 0,
             intent,
             PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )