From b511867e626a893086dd4e61f27030cc392f15a7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 5 Dec 2022 09:38:41 +0100 Subject: [PATCH] Fixed participants count in ICS if organizer is part of participants list --- .../main/chat/data/ChatMessageContentData.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt index 9edb0017f..60d2f42dc 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt @@ -330,7 +330,20 @@ class ChatMessageContentData( conferenceDuration.value = TimestampUtils.durationToString(hours.toInt(), remainMinutes) showDuration.value = minutes > 0 - conferenceParticipantCount.value = String.format(AppUtils.getString(R.string.conference_invite_participants_count), conferenceInfo.participants.size + 1) // +1 for organizer + // Check if organizer is part of participants list + var participantsCount = conferenceInfo.participants.size + val organizer = conferenceInfo.organizer + var organizerFound = false + if (organizer != null) { + for (participant in conferenceInfo.participants) { + if (participant.weakEqual(organizer)) { + organizerFound = true + break + } + } + } + if (!organizerFound) participantsCount += 1 // +1 for organizer + conferenceParticipantCount.value = String.format(AppUtils.getString(R.string.conference_invite_participants_count), participantsCount) } else if (conferenceInfo == null) { if (content.filePath != null) { try {