mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not display event on one to one chat room

Browse source
This commit is contained in:
Benjamin Reis 2018-02-13 13:23:04 +01:00
parent dbdf49a3af
commit 936d892e35
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/ChatConversationTableView.m
View file

@ -49,7 +49,10 @@
if (!_chatRoom)
return;
[self clearEventList];
eventList = linphone_chat_room_get_history_events(_chatRoom, 0);
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
eventList = (capabilities & LinphoneChatRoomCapabilitiesOneToOne)
? linphone_chat_room_get_history_message_events(_chatRoom, 0)
: linphone_chat_room_get_history_events(_chatRoom, 0);
for (FileTransferDelegate *ftd in [LinphoneManager.instance fileTransferDelegates]) {
const LinphoneAddress *ftd_peer =

7
Classes/ChatConversationView.m
View file

@ -133,7 +133,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[self callUpdateEvent:nil];
PhoneMainView.instance.currentRoom = _chatRoom;
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
bctbx_list_t *participants = linphone_chat_room_get_participants(_chatRoom);
LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(_chatRoom);
@ -378,8 +378,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)updateSuperposedButtons {
[_backToCallButton update];
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
_infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesBasic)
|| (capabilities & LinphoneChatRoomCapabilitiesOneToOne)
_infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesOneToOne)
|| !_backToCallButton.hidden
|| _tableController.tableView.isEditing);
_callButton.hidden = !_backToCallButton.hidden || !_infoButton.hidden || _tableController.tableView.isEditing;
@ -387,7 +386,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)updateParticipantLabel {
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
_particpantsLabel.hidden = TRUE;
} else {
_particpantsLabel.hidden = FALSE;

2
Classes/LinphoneUI/UIChatCell.m
View file

@ -65,7 +65,7 @@
}
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(chatRoom);
if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
bctbx_list_t *participants = linphone_chat_room_get_participants(chatRoom);
LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(chatRoom);