diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 155c03c7b..59b4a686b 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -476,9 +476,6 @@ "settings_add_3pid_password_title_msidsn" = "Add phone number"; "settings_add_3pid_password_message" = "To continue, please enter your password"; "settings_add_3pid_invalid_password_message" = "Invalid password"; -//"settings_add_3pid_auth_flow_not_supported" = "%@ does not support the authentication required by your homeserver to add a third party identifier. Please use the web version of the app."; -"settings_add_3pid_auth_flow_not_supported" = "%@ does not support the authentication required by your homeserver. Please use the web version of the app."; - "settings_crypto_device_name" = "Device Public Name: "; "settings_crypto_device_id" = "\nDevice ID: "; @@ -1058,3 +1055,4 @@ // Generic errors "error_invite_3pid_with_no_identity_server" = "Add an identity server in your settings to invite by email."; +"error_not_supported_on_mobile" = "You can't do this from %@ mobile."; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index e8511c04d..12b5d5b6b 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -998,6 +998,10 @@ internal enum VectorL10n { internal static var errorInvite3pidWithNoIdentityServer: String { return VectorL10n.tr("Vector", "error_invite_3pid_with_no_identity_server") } + /// You can't do this from %@ mobile. + internal static func errorNotSupportedOnMobile(_ p1: String) -> String { + return VectorL10n.tr("Vector", "error_not_supported_on_mobile", p1) + } /// It looks like you’re trying to connect to another homeserver. Do you want to sign out? internal static var errorUserAlreadyLoggedIn: String { return VectorL10n.tr("Vector", "error_user_already_logged_in") @@ -2550,10 +2554,6 @@ internal enum VectorL10n { internal static var serviceTermsModalTitleIdentityServer: String { return VectorL10n.tr("Vector", "service_terms_modal_title_identity_server") } - /// %@ does not support the authentication required by your homeserver. Please use the web version of the app. - internal static func settingsAdd3pidAuthFlowNotSupported(_ p1: String) -> String { - return VectorL10n.tr("Vector", "settings_add_3pid_auth_flow_not_supported", p1) - } /// Invalid password internal static var settingsAdd3pidInvalidPasswordMessage: String { return VectorL10n.tr("Vector", "settings_add_3pid_invalid_password_message") diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index 2b111bcda..fd0eb5b0a 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -1248,15 +1248,15 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> } } - NSString *title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_email", @"Vector", nil); - if ([medium isEqualToString:kMX3PIDMediumMSISDN]) - { - title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_msidsn", @"Vector", nil); - } - if (hasPasswordFlow) { // Ask password to the user while we are here + NSString *title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_email", @"Vector", nil); + if ([medium isEqualToString:kMX3PIDMediumMSISDN]) + { + title = NSLocalizedStringFromTable(@"settings_add_3pid_password_title_msidsn", @"Vector", nil); + } + [self requestAccountPasswordWithTitle:title message:NSLocalizedStringFromTable(@"settings_add_3pid_password_message", @"Vector", nil) onComplete:onComplete]; @@ -1265,8 +1265,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> { // The user needs to use Riot-web NSString *appName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"]; - NSString *message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_add_3pid_auth_flow_not_supported", @"Vector", nil), appName]; - [[AppDelegate theDelegate] showAlertWithTitle:title message:message]; + NSString *message = [NSString stringWithFormat:NSLocalizedStringFromTable(@"error_not_supported_on_mobile", @"Vector", nil), appName]; + [[AppDelegate theDelegate] showAlertWithTitle:nil message:message]; } } else