From e62ca22d234c39b0dff5963bf4995f283908dbad Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 9 Nov 2018 16:50:38 +0100 Subject: [PATCH] set image for securityButton --- Classes/ChatConversationView.m | 1 + Classes/DevicesListView.m | 2 +- Classes/LinphoneUI/UIDevicesDetails.h | 1 + Classes/LinphoneUI/UIDevicesDetails.m | 4 ++++ Classes/Utils/FastAddressBook.m | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index ebb32377b..845a5e425 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -229,6 +229,7 @@ static UICompositeViewDescription *compositeDescription = nil; [_tableController setChatRoom:_chatRoom]; _chatView.hidden = NO; + [_encryptedButton setImage:[FastAddressBook imageForSecurityLevel:linphone_chat_room_get_security_level(_chatRoom)] forState:UIControlStateNormal]; [self update]; [self shareFile]; } diff --git a/Classes/DevicesListView.m b/Classes/DevicesListView.m index a08552251..0b4ca2aa8 100644 --- a/Classes/DevicesListView.m +++ b/Classes/DevicesListView.m @@ -127,7 +127,7 @@ static UICompositeViewDescription *compositeDescription = nil; DevicesMenuEntry *entry = [_devicesMenuEntries objectAtIndex:indexPath.row]; [ContactDisplay setDisplayNameLabel:cell.addressLabel forAddress:linphone_participant_get_address(entry->participant)]; - cell.devices = linphone_participant_get_devices(entry->participant); + cell.participant = entry->participant; [cell update:(entry->numberOfDevices != 0)]; return cell; diff --git a/Classes/LinphoneUI/UIDevicesDetails.h b/Classes/LinphoneUI/UIDevicesDetails.h index 5d45c268b..36a91a1df 100644 --- a/Classes/LinphoneUI/UIDevicesDetails.h +++ b/Classes/LinphoneUI/UIDevicesDetails.h @@ -16,6 +16,7 @@ @property (weak, nonatomic) IBOutlet UIButton *securityButton; @property (weak, nonatomic) IBOutlet UITableView *devicesTable; @property bctbx_list_t *devices; +@property LinphoneParticipant *participant; - (IBAction)onSecurityCallClick:(id)sender; - (id)initWithIdentifier:(NSString *)identifier; diff --git a/Classes/LinphoneUI/UIDevicesDetails.m b/Classes/LinphoneUI/UIDevicesDetails.m index 66497d622..602e26d92 100644 --- a/Classes/LinphoneUI/UIDevicesDetails.m +++ b/Classes/LinphoneUI/UIDevicesDetails.m @@ -27,13 +27,17 @@ } - (void)update:(BOOL)listOpen { + _devices = linphone_participant_get_devices(_participant); + UIImage *image = [FastAddressBook imageForSecurityLevel:linphone_participant_get_security_level(_participant)]; if (bctbx_list_size(_devices) == 1) { + [_securityButton setImage:image forState:UIControlStateNormal]; _securityButton.hidden = FALSE; _dropMenuButton.hidden = TRUE; } else { UIImage *image = listOpen ? [UIImage imageNamed:@"chevron_list_open"] : [UIImage imageNamed:@"chevron_list_close"]; [_dropMenuButton setImage:image forState:UIControlStateNormal]; } + [_securityImage setImage:image]; } - (IBAction)onSecurityCallClick:(id)sender { diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index d9c610d41..3db5350ef 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -58,7 +58,7 @@ return [UIImage imageNamed:@"security_2_indicator.png.png"]; default: - return nil; + return [UIImage imageNamed:@"security_toogle_icon_grey.png"]; } }