From 7c253eb0ad9cb4dbb1ea4e404dc4076f0bd95189 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 1 Dec 2017 15:49:05 +0100 Subject: [PATCH] keep fixing UI --- Classes/ChatConversationCreateTableView.m | 5 ++++- Classes/ChatConversationInfoView.m | 8 ++++---- submodules/linphone | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m index 41bc0af9b..aa688e8da 100644 --- a/Classes/ChatConversationCreateTableView.m +++ b/Classes/ChatConversationCreateTableView.m @@ -71,7 +71,10 @@ } - (void)reloadDataWithFilter:(NSString *)filter { - [_contacts removeAllObjects]; + if (_contacts) + [_contacts removeAllObjects]; + else + _contacts = [[NSMutableDictionary alloc] initWithCapacity:_allContacts.count]; [_allContacts enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) { NSString *address = (NSString *)key; diff --git a/Classes/ChatConversationInfoView.m b/Classes/ChatConversationInfoView.m index 4822ba6bd..0005b52cb 100644 --- a/Classes/ChatConversationInfoView.m +++ b/Classes/ChatConversationInfoView.m @@ -74,6 +74,10 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; _waitView.hidden = YES; + + if (_create) + _room = NULL; + _nameLabel.text = _room && linphone_chat_room_get_subject(_room) ? [NSString stringWithUTF8String:linphone_chat_room_get_subject(_room)] : @""; @@ -112,10 +116,6 @@ static UICompositeViewDescription *compositeDescription = nil; [_tableView reloadData]; } -- (void)viewWillDisappear:(BOOL)animated { - _room = NULL; -} - #pragma mark - next functions - (void)onCreate { diff --git a/submodules/linphone b/submodules/linphone index eb3fbf682..47cf1d436 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit eb3fbf682d8d177807c84aaa4aecd869dc755fde +Subproject commit 47cf1d436cdfff29a7b3cb0a4cbfc3a758d78240