change logic to not delete bubbles

instead to use KEY_NOTIFICATION_RESTRICT_DELETION, always check if notification is actually bubbled in cancelNotification

Without this commit, bubbled notifications would remain open when the chat was opened in normal mode.
With this commit, bubbled notifications will be removed when opening the chat in normal mode.

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -2708,8 +2708,9 @@ open class ChatActivity :
 
     @Suppress("Detekt.TooGenericExceptionCaught")
     protected open fun cancelNotificationsForCurrentConversation() {
+        val isBubbleMode = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && isLaunchedFromBubble
         if (conversationUser != null) {
-            if (!TextUtils.isEmpty(roomToken)) {
+            if (!TextUtils.isEmpty(roomToken) && !isBubbleMode) {
                 try {
                     NotificationUtils.cancelExistingNotificationsForRoom(
                         applicationContext,
@@ -3541,11 +3542,9 @@ open class ChatActivity :
                 val messagingStyle = androidx.core.app.NotificationCompat.MessagingStyle(person)
                     .setConversationTitle(conversationName)
 
-                // Create extras bundle to protect bubble from deletion
                 val notificationExtras = bundleOf(
-                    BundleKeys.KEY_ROOM_TOKEN to roomToken,
-                    BundleKeys.KEY_NOTIFICATION_RESTRICT_DELETION to true,
-                    BundleKeys.KEY_INTERNAL_USER_ID to conversationUser!!.id!!
+                    KEY_ROOM_TOKEN to roomToken,
+                    KEY_INTERNAL_USER_ID to conversationUser!!.id!!
                 )
 
                 val channelId = NotificationUtils.NotificationChannels.NOTIFICATION_CHANNEL_MESSAGES_V4.name

app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt

@@ -657,8 +657,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
         notificationInfoBundle.putString(KEY_ROOM_TOKEN, pushMessage.id)
         notificationInfoBundle.putLong(KEY_NOTIFICATION_ID, pushMessage.notificationId!!)
 
-        // Protect bubble notifications from being canceled
-        if (pushMessage.type == TYPE_RECORDING || pushMessage.type == TYPE_CHAT || pushMessage.type == TYPE_REMINDER) {
+        if (pushMessage.type == TYPE_RECORDING) {
             notificationInfoBundle.putBoolean(KEY_NOTIFICATION_RESTRICT_DELETION, true)
         }
 

app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt

@@ -22,6 +22,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.media.AudioAttributes
 import android.net.Uri
+import android.os.Build
 import android.service.notification.StatusBarNotification
 import android.text.TextUtils
 import android.util.Log
@@ -241,14 +242,14 @@ object NotificationUtils {
 
     fun cancelNotification(context: Context?, conversationUser: User, notificationId: Long?) {
         scanNotifications(context, conversationUser) { notificationManager, statusBarNotification, notification ->
-            if (notificationId == notification.extras.getLong(BundleKeys.KEY_NOTIFICATION_ID)) {
-                if (notification.extras.getBoolean(BundleKeys.KEY_NOTIFICATION_RESTRICT_DELETION)) {
-                    if (BuildConfig.DEBUG) {
-                        Log.d(TAG, "Skip cancelling protected notification ${statusBarNotification.id}")
-                    }
-                } else {
-                    notificationManager.cancel(statusBarNotification.id)
-                }
+            val matchesId = notificationId == notification.extras.getLong(BundleKeys.KEY_NOTIFICATION_ID)
+
+            val isBubble =
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+                    (notification.flags and Notification.FLAG_BUBBLE) != 0
+
+            if (matchesId && !isBubble) {
+                notificationManager.cancel(statusBarNotification.id)
             }
         }
     }