From bd42b8855ce32210088508638d640512733999dc Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 21 Nov 2022 12:07:18 +0100 Subject: [PATCH] Add hide_link_phone_number in RC setting for hide link_account view --- Classes/AssistantView.m | 6 +++++- Classes/LinphoneManager.m | 6 +++++- Classes/SideMenuTableView.m | 2 +- Resources/linphonerc-factory | 2 ++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index eaec0af23..51e86b2a0 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -1158,7 +1158,11 @@ static UICompositeViewDescription *compositeDescription = nil; _outgoingView = DialerView.compositeViewDescription; [self configureAccount]; } else if (status == LinphoneAccountCreatorStatusAccountExist) { - _outgoingView = AssistantLinkView.compositeViewDescription; + if([LinphoneManager.instance lpConfigIntForKey:@"hide_link_phone_number"]){ + _outgoingView = DialerView.compositeViewDescription; + }else{ + _outgoingView = AssistantLinkView.compositeViewDescription; + } [self configureAccount]; } else { if (resp) { diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index b1c2b8654..c7c0681d2 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -282,6 +282,10 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre if ([self lpConfigStringForKey:@"display_link_account_popup"] == nil) { [self lpConfigSetBool:true forKey:@"display_link_account_popup"]; } + + if ([self lpConfigStringForKey:@"hide_link_phone_number"] == nil) { + [self lpConfigSetInt:1 forKey:@"hide_link_phone_number"]; + } [self migrateFromUserPrefs]; [self loadAvatar]; @@ -1312,7 +1316,7 @@ void popup_link_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreat NSDate *nextTime = [NSDate dateWithTimeIntervalSince1970:[self lpConfigIntForKey:@"must_link_account_time" withDefault:1]]; NSDate *now = [NSDate date]; - if (nextTime.timeIntervalSince1970 > 0 && [now earlierDate:nextTime] == nextTime && [LinphoneManager.instance lpConfigBoolForKey:@"display_link_account_popup"]) { + if (nextTime.timeIntervalSince1970 > 0 && [now earlierDate:nextTime] == nextTime && [LinphoneManager.instance lpConfigBoolForKey:@"display_link_account_popup"] && ![LinphoneManager.instance lpConfigIntForKey:@"hide_link_phone_number"]) { LinphoneAccount *account = linphone_core_get_default_account(LC); if (account) { const char *username = linphone_address_get_username(linphone_account_params_get_identity_address(linphone_account_get_params(account))); diff --git a/Classes/SideMenuTableView.m b/Classes/SideMenuTableView.m index e8a8fcb7a..94b41152e 100644 --- a/Classes/SideMenuTableView.m +++ b/Classes/SideMenuTableView.m @@ -70,7 +70,7 @@ MSList *accounts = [LinphoneManager.instance createAccountsNotHiddenList]; BOOL hasAccount = accounts != NULL; bctbx_free(accounts); - if (mustLink && hasAccount) { + if (mustLink && hasAccount && ![LinphoneManager.instance lpConfigIntForKey:@"hide_link_phone_number"]) { [_sideMenuEntries addObject:[[SideMenuEntry alloc] initWithTitle:NSLocalizedString(@"Link my account", nil) image:[UIImage imageNamed:@"menu_link_account.png"] diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index db5ba7642..c0793518a 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -30,6 +30,8 @@ accept_early_media=0 force_lime_chat_rooms=0 enable_native_address_book=1 +hide_link_phone_number=0 + [rtp] accept_any_encryption=1