diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index b57cdea73..b1c2b8654 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -278,6 +278,10 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre [self lpConfigSetString:@"conflate" forKey:@"handle_content_encoding" inSection:@"misc"]; #endif } + + if ([self lpConfigStringForKey:@"display_link_account_popup"] == nil) { + [self lpConfigSetBool:true forKey:@"display_link_account_popup"]; + } [self migrateFromUserPrefs]; [self loadAvatar]; @@ -1282,7 +1286,14 @@ void popup_link_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreat handler:^(UIAlertAction * action) { [PhoneMainView.instance changeCurrentView:AssistantLinkView.compositeViewDescription]; }]; + + UIAlertAction* otherAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Never ask again", nil) + style:UIAlertActionStyleDefault + handler:^(UIAlertAction * action) { + [LinphoneManager.instance lpConfigSetBool:false forKey:@"display_link_account_popup"]; + }]; defaultAction.accessibilityLabel = @"Later"; + [errView addAction:otherAction]; [errView addAction:defaultAction]; [errView addAction:continueAction]; [PhoneMainView.instance presentViewController:errView animated:YES completion:nil]; @@ -1301,7 +1312,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) { + if (nextTime.timeIntervalSince1970 > 0 && [now earlierDate:nextTime] == nextTime && [LinphoneManager.instance lpConfigBoolForKey:@"display_link_account_popup"]) { 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/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings index d69c5259e..dee4fd811 100644 Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings index 793489891..9b8205ba4 100644 Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 76f33d13e..7d43918de 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 1efbd4147..f1cf0bdec 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings index 7ceeeff94..7d2acb02c 100644 Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings index aa7c530a2..c755c3f9a 100644 Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings index 86adb20af..70671d7d9 100644 Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ