From 9ba95b024c28f8a55a567daf85df93e32c420d6f Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Sun, 4 Dec 2022 18:20:36 +0100 Subject: [PATCH] Disable call merge into conference if not admin of conference --- .../Swift/Voip/Views/Fragments/CallsList/CallsListView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Swift/Voip/Views/Fragments/CallsList/CallsListView.swift b/Classes/Swift/Voip/Views/Fragments/CallsList/CallsListView.swift index ba6fe96cf..4f2f318b7 100644 --- a/Classes/Swift/Voip/Views/Fragments/CallsList/CallsListView.swift +++ b/Classes/Swift/Voip/Views/Fragments/CallsList/CallsListView.swift @@ -112,7 +112,7 @@ import linphonesw func mergeToConferencePossible() -> Bool { // 2 calls or more not in conf or 1 call or more and 1 conf let callsNotInConf = numberOfCallsNotInConf() - return (ConferenceViewModel.shared.conferenceExists.value == true && callsNotInConf >= 1) || (ConferenceViewModel.shared.conferenceExists.value != true && callsNotInConf >= 2 ) + return (ConferenceViewModel.shared.conferenceExists.value == true && callsNotInConf >= 1 && ConferenceViewModel.shared.conference.value?.me?.isAdmin == true) || (ConferenceViewModel.shared.conferenceExists.value != true && callsNotInConf >= 2 ) }