From 351d68e2ac1ee41338c81512b30685aecc41ab28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 21 Feb 2024 14:48:04 -0500
Subject: [PATCH] notification service: use proper value for hasVideo

Change-Id: I35a4081e3ccfb35d8091f91f2d76775362566f50
---
 .../java/cx/ring/services/NotificationServiceImpl.kt   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt
index 951401213..0b241b94c 100644
--- a/jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt
+++ b/jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt
@@ -131,6 +131,8 @@ class NotificationServiceImpl(
             .setImportant(true)
             .build()
 
+        val hasVideo = conference.hasVideo()
+
         val messageNotificationBuilder: NotificationCompat.Builder
         if (conference.isOnGoing) {
             messageNotificationBuilder = NotificationCompat.Builder(mContext, NOTIF_CHANNEL_CALL_IN_PROGRESS)
@@ -151,7 +153,7 @@ class NotificationServiceImpl(
                             .putExtra(NotificationService.KEY_CALL_ID, call.daemonIdString)
                             .putExtra(ConversationPath.KEY_ACCOUNT_ID, accountId),
                         ContentUriHandler.immutable(PendingIntent.FLAG_ONE_SHOT)))
-                    .setIsVideo(conference.hasVideo()))
+                    .setIsVideo(hasVideo))
         } else if (conference.isRinging) {
             if (conference.isIncoming) {
                 messageNotificationBuilder = NotificationCompat.Builder(mContext, NOTIF_CHANNEL_INCOMING_CALL)
@@ -174,8 +176,8 @@ class NotificationServiceImpl(
                                 .putExtra(ConversationPath.KEY_ACCOUNT_ID, accountId)
                                 .putExtra(NotificationService.KEY_CALL_ID, call.daemonIdString)
                                 .putExtra(CallPresenter.KEY_ACCEPT_OPTION, CallPresenter.ACCEPT_HOLD)
-                                .putExtra(CallFragment.KEY_HAS_VIDEO, true), ContentUriHandler.immutable(PendingIntent.FLAG_ONE_SHOT)))
-                            .setIsVideo(conference.hasVideo()))
+                                .putExtra(CallFragment.KEY_HAS_VIDEO, hasVideo), ContentUriHandler.immutable(PendingIntent.FLAG_ONE_SHOT)))
+                            .setIsVideo(hasVideo))
             } else {
                 messageNotificationBuilder = NotificationCompat.Builder(mContext, NOTIF_CHANNEL_CALL_IN_PROGRESS)
                     .setContentTitle(mContext.getString(R.string.notif_outgoing_call_title, contact.displayName))
@@ -192,7 +194,7 @@ class NotificationServiceImpl(
                                 .putExtra(NotificationService.KEY_CALL_ID, call.daemonIdString)
                                 .putExtra(ConversationPath.KEY_ACCOUNT_ID, accountId),
                             ContentUriHandler.immutable(PendingIntent.FLAG_ONE_SHOT)))
-                        .setIsVideo(conference.hasVideo()))
+                        .setIsVideo(hasVideo))
                     .setColor(ContextCompat.getColor(mContext, R.color.color_primary_light))
             }
         } else {
-- 
GitLab