From 10b28cd6cfc961d098208fde10bec989b69c954b Mon Sep 17 00:00:00 2001 From: QuentinArguillere Date: Mon, 27 Jun 2022 16:50:38 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20canAdminEphemeral=20function=20in=20ChatC?= =?UTF-8?q?onversationViews=20so=20that=20only=20encrypted=20chatrooms=20c?= =?UTF-8?q?an=20possibly=20return=20=E2=80=9Ctrue=E2=80=9D.=20Also=20fix?= =?UTF-8?q?=20bug=20causing=20the=20wrong=20row=20to=20be=20called=20in=20?= =?UTF-8?q?chatroom=20popup=20action=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/ChatConversationView.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index 9ad062496..823bf1742 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -426,7 +426,7 @@ static UICompositeViewDescription *compositeDescription = nil; if (!room) return true; LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(room); - return capabilities & LinphoneChatRoomCapabilitiesBasic; + return capabilities & LinphoneChatRoomCapabilitiesEncrypted; } @@ -1747,8 +1747,7 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog } -(BOOL) canAdminEphemeral:(const LinphoneChatRoom *)cr { - if (!cr) return FALSE; - if ([ChatConversationView isBasicChatRoom:_chatRoom]) return FALSE; + if (!cr || !isEncrypted) return FALSE; // If ephemeral mode is DeviceManaged, then we don't need to check anything else return (linphone_chat_room_params_get_ephemeral_mode(linphone_chat_room_get_current_params(cr)) == LinphoneChatRoomEphemeralModeDeviceManaged) @@ -1771,7 +1770,6 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [self onToggleMenu:nil]; - BOOL isEncrypted = ![ChatConversationView isBasicChatRoom:_chatRoom]; if (indexPath.row == 0) { if (isOneToOne) {