Resolving Telephony Notifications Overlapping Issues

choiman1559 · Jul 20, 2023 · 328118a · 328118a
1 parent 8e37f72
commit 328118a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/app/src/main/java/com/noti/main/service/FirebaseMessageService.java b/app/src/main/java/com/noti/main/service/FirebaseMessageService.java
@@ -531,10 +531,14 @@ protected void sendTelecomNotification(Map<String, String> map) {
                 .setContentText("click here to reply or open dialer")
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setContentIntent(pendingIntent)
-                .setGroup(getPackageName() + ".NOTIFICATION")
-                .setGroupSummary(true)
                 .setAutoCancel(true);
 
+        if(Build.VERSION.SDK_INT < 33) {
+            builder
+                    .setGroup(getPackageName() + ".NOTIFICATION")
+                    .setGroupSummary(true);
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             builder.setSmallIcon(R.drawable.ic_notification);
             CharSequence channelName = getString(R.string.notify_channel_name);
@@ -547,7 +551,7 @@ protected void sendTelecomNotification(Map<String, String> map) {
         } else builder.setSmallIcon(R.mipmap.ic_notification);
 
         assert notificationManager != null;
-        notificationManager.notify((int) ((new Date().getTime() / 1000L) % Integer.MAX_VALUE), builder.build());
+        notificationManager.notify(uniqueCode, builder.build());
         playRingtoneAndVibrate();
     }
 
@@ -588,10 +592,14 @@ protected void sendSmsNotification(Map<String, String> map) {
                 .setContentText(message)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setContentIntent(pendingIntent)
-                .setGroup(getPackageName() + ".NOTIFICATION")
-                .setGroupSummary(true)
                 .setAutoCancel(true);
 
+        if(Build.VERSION.SDK_INT < 33) {
+            builder
+                    .setGroup(getPackageName() + ".NOTIFICATION")
+                    .setGroupSummary(true);
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             builder.setSmallIcon(R.drawable.ic_notification);
             CharSequence channelName = getString(R.string.notify_channel_name);
@@ -604,7 +612,7 @@ protected void sendSmsNotification(Map<String, String> map) {
         } else builder.setSmallIcon(R.mipmap.ic_notification);
 
         assert notificationManager != null;
-        notificationManager.notify((int) ((new Date().getTime() / 1000L) % Integer.MAX_VALUE), builder.build());
+        notificationManager.notify(uniqueCode, builder.build());
         playRingtoneAndVibrate();
     }