witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix crash unknow

Browse source
This commit is contained in:
Danmei Chen 2019-12-20 11:57:49 +01:00
parent ab9351bb78
commit a88c501154
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/ChatConversationView.m
View file

@ -488,8 +488,8 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)updateSuperposedButtons {
[_backToCallButton update];
LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
_infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesOneToOne)
BOOL isOneToOneChat = _chatRoom && (linphone_chat_room_get_capabilities(_chatRoom) & LinphoneChatRoomCapabilitiesOneToOne);
_infoButton.hidden = ((isOneToOneChat & LinphoneChatRoomCapabilitiesOneToOne)
|| !_backToCallButton.hidden
|| _tableController.tableView.isEditing);
_callButton.hidden = !_backToCallButton.hidden || !_infoButton.hidden || _tableController.tableView.isEditing;

6
Classes/LinphoneCoreSettingsStore.m
View file

@ -181,9 +181,9 @@
[self setBool:pushEnabled forKey:@"account_pushnotification_preference"];
}
const LinphoneAddress *identity_addr = linphone_proxy_config_get_identity_address(proxy);
if (identity_addr) {
const char *server_addr = linphone_proxy_config_get_server_addr(proxy);
LinphoneAddress *proxy_addr = linphone_core_interpret_url(LC, server_addr);
const char *server_addr = linphone_proxy_config_get_server_addr(proxy);
LinphoneAddress *proxy_addr = linphone_core_interpret_url(LC, server_addr);
if (identity_addr && proxy_addr) {
int port = linphone_address_get_port(proxy_addr);
[self setCString:linphone_address_get_username(identity_addr)