Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Settings/Bind: Ask the user to validate the email again if they have … #2749

Merged
merged 1 commit into from Oct 4, 2019
Merged

Settings/Bind: Ask the user to validate the email again if they have … #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions Riot/Generated/Strings.swift
View file
Open in desktop
Expand Up @@ -994,16 +994,14 @@ internal enum VectorL10n {
internal static var encryptedRoomMessageReplyToPlaceholder: String {
return VectorL10n.tr("Vector", "encrypted_room_message_reply_to_placeholder")
}

/// Add an identity server in your settings to invite by email.
internal static var errorInvite3pidWithNoIdentityServer: String {
return VectorL10n.tr("Vector", "error_invite_3pid_with_no_identity_server")

}
/// 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")
return VectorL10n.tr("Vector", "error_user_already_logged_in")
}

/// VoIP conference added by %@
internal static func eventFormatterJitsiWidgetAdded(_ p1: String) -> String {
return VectorL10n.tr("Vector", "event_formatter_jitsi_widget_added", p1)
Expand Down Expand Up @@ -2284,9 +2282,9 @@ internal enum VectorL10n {
internal static var roomParticipantsRemovePromptTitle: String {
return VectorL10n.tr("Vector", "room_participants_remove_prompt_title")
}
/// Remove third-party invite is not supported yet until the api exists
internal static var roomParticipantsRemoveThirdPartyInviteMsg: String {
return VectorL10n.tr("Vector", "room_participants_remove_third_party_invite_msg")
/// Are you sure you want to revoke this invite?
internal static var roomParticipantsRemoveThirdPartyInvitePromptMsg: String {
return VectorL10n.tr("Vector", "room_participants_remove_third_party_invite_prompt_msg")
}
/// No identity server is configured so you cannot start a chat with a contact using an email.
internal static var roomParticipantsStartNewChatErrorUsingUserEmailWithoutIdentityServer: String {
Expand Down
4 changes: 3 additions & 1 deletion ...odules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewModel.swift
View file
Open in desktop
Expand Up @@ -190,7 +190,9 @@ final class SettingsDiscoveryThreePidDetailsViewModel: SettingsDiscoveryThreePid

self.checkThreePidDiscoverability()
case .failure(let error):
if let mxError = MXError(nsError: error), mxError.errcode == kMXErrCodeStringThreePIDAuthFailed {
if let mxError = MXError(nsError: error),
(mxError.errcode == kMXErrCodeStringThreePIDAuthFailed
|| mxError.errcode == kMXErrCodeStringUnknown) {
self.update(viewState: .loaded(displayMode: .pendingThreePidVerification))
} else {
if threePidAddSession.medium == kMX3PIDMediumEmail {
Expand Down