forked from mirrors/linphone-iphone
Add hide_link_phone_number in RC setting for hide link_account view
This commit is contained in:
parent
59098c6db0
commit
7a78a14bbf
4 changed files with 13 additions and 3 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
|
|
|
|||
|
|
@ -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"]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue