fix: fix notification cleaning from leave button in notification

Author: rahul-lohra

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/DefaultStreamIntentResolver.kt

@@ -367,10 +367,6 @@ public class DefaultStreamIntentResolver(
                 resolveInfo.activityInfo.name,
             )
             putExtra(NotificationHandler.INTENT_EXTRA_CALL_CID, callId)
-            putExtra(
-                NotificationHandler.INTENT_EXTRA_NOTIFICATION_ID,
-                callId.cid,
-            )
         }
     }
 }

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/NotificationHandler.kt

@@ -70,6 +70,11 @@ public interface NotificationHandler :
         const val INTENT_EXTRA_CALL_DISPLAY_NAME: String =
             "io.getstream.video.android.intent-extra.call_displayname"
 
+        @Deprecated(
+            message = "Notification ids are managed internally and this extra is no longer " +
+                "populated. Read the active notification id from CallState.notificationIdFlow, or " +
+                "derive it with StreamCallId.getNotificationId(NotificationType).",
+        )
         const val INTENT_EXTRA_NOTIFICATION_ID: String =
             "io.getstream.video.android.intent-extra.notification_id"
 

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/notifications/internal/receivers/LeaveCallBroadcastReceiver.kt

@@ -24,7 +24,7 @@ import io.getstream.video.android.core.Call
 import io.getstream.video.android.core.CallLeaveReason
 import io.getstream.video.android.core.UserActionCause
 import io.getstream.video.android.core.notifications.NotificationHandler.Companion.ACTION_LEAVE_CALL
-import io.getstream.video.android.core.notifications.NotificationHandler.Companion.INTENT_EXTRA_NOTIFICATION_ID
+import io.getstream.video.android.model.StreamCallId
 
 /**
  * Used to process any pending intents that feature the [ACTION_LEAVE_CALL] action. By consuming this
@@ -39,13 +39,23 @@ internal class LeaveCallBroadcastReceiver : GenericCallActionBroadcastReceiver()
     override suspend fun onReceive(call: Call, context: Context, intent: Intent) {
         logger.d { "[onReceive] #ringing; callId: ${call.id}, action: ${intent.action}" }
 
+        // A call has at most one notification; its id is stored at creation time in
+        // CallState.notificationIdFlow (the source of truth, replacing the deprecated
+        // INTENT_EXTRA_NOTIFICATION_ID extra).
+        val notificationId = call.state.notificationIdFlow.value
+        // TODO: remove this legacy notification id once nothing posts under StreamCallId.hashCode().
+        val legacyNotificationId = StreamCallId.fromCallCid(call.cid).hashCode()
+
         call.leave(
             CallLeaveReason.UserAction(
                 UserActionCause.LEAVE_FROM_NOTIFICATION,
             ),
         )
-        val notificationId = intent.getIntExtra(INTENT_EXTRA_NOTIFICATION_ID, 0)
-        logger.d { "[onReceive], notificationId: $notificationId" }
-        NotificationManagerCompat.from(context).cancel(notificationId)
+        logger.d {
+            "[onReceive], notificationId: $notificationId, legacyNotificationId: $legacyNotificationId"
+        }
+        val notificationManager = NotificationManagerCompat.from(context)
+        notificationId?.let { notificationManager.cancel(it) }
+        notificationManager.cancel(legacyNotificationId)
     }
 }

stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/notification/AbstractNotificationActivity.kt

@@ -22,7 +22,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.lifecycle.lifecycleScope
 import io.getstream.video.android.core.StreamVideo
 import io.getstream.video.android.core.notifications.NotificationHandler.Companion.INTENT_EXTRA_CALL_CID
-import io.getstream.video.android.core.notifications.NotificationHandler.Companion.INTENT_EXTRA_NOTIFICATION_ID
+import io.getstream.video.android.core.notifications.NotificationType
 import io.getstream.video.android.model.StreamCallId
 import io.getstream.video.android.model.streamCallId
 import kotlinx.coroutines.launch
@@ -56,7 +56,7 @@ public abstract class AbstractNotificationActivity : ComponentActivity() {
 
         lifecycleScope.launch {
             if (hasAcceptedCall) {
-                dismissIncomingCallNotifications()
+                dismissIncomingCallNotifications(callCid)
             } else {
                 loadCallData(callCid)
             }
@@ -74,15 +74,18 @@ public abstract class AbstractNotificationActivity : ComponentActivity() {
 //            is Result.Success -> Unit
 //            is Result.Failure -> finish()
 //        }
-        dismissIncomingCallNotifications()
+        dismissIncomingCallNotifications(guid)
     }
 
     /**
      * Dismisses any notifications that might be active with a given notification ID.
      * Used to clear up the notification state if the call has been accepted or rejected.
      */
-    private fun dismissIncomingCallNotifications() {
-        val notificationId = intent.getIntExtra(INTENT_EXTRA_NOTIFICATION_ID, 0)
+    private fun dismissIncomingCallNotifications(callCid: StreamCallId) {
+        // A call has a single notification; the incoming-call notification's id comes from the
+        // shared generator, so derive it from the call id and cancel it. (Replaces the deprecated
+        // INTENT_EXTRA_NOTIFICATION_ID extra.)
+        val notificationId = callCid.getNotificationId(NotificationType.Incoming)
         NotificationManagerCompat.from(this).cancel(notificationId)
         finish()
     }