Merge pull request #2749 from vector-im/fix_bind_continue

Settings/Bind: Ask the user to validate the email again if they have …
element-hq · Oct 4, 2019 · 64e6831 · 64e6831
2 parents 2dda0a6 + 04ee482
commit 64e6831
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
@@ -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)
@@ -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 { 

diff --git a/...odules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewModel.swift b/...odules/Settings/Discovery/ThreePidDetails/SettingsDiscoveryThreePidDetailsViewModel.swift
@@ -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 {