Skip to content

Commit

Permalink
Settings/Bind: Ask the user to validate the email again if they have …
Browse files Browse the repository at this point in the history
…not validated it yet

instead of displaying an error dialog.
This bug happened only with the new HS add and bind APIs (MSC2290) flow because new IS API returns only `M_UNKNOWN`.
  • Loading branch information
manuroe committed Oct 4, 2019
1 parent 2dda0a6 commit 04ee482
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 5 additions & 7 deletions Riot/Generated/Strings.swift
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit 04ee482

Please sign in to comment.