feat: handle non federated domain connection request (WPB-2219) (#2068)

wireapp · Aug 8, 2023 · 5e3a9e3 · 5e3a9e3
1 parent b875f2b
commit 5e3a9e3
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 15 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt
@@ -92,15 +92,24 @@ class ConnectionActionButtonViewModelImpl @Inject constructor(
         viewModelScope.launch {
             state = state.performAction()
             when (sendConnectionRequest(userId)) {
-                is SendConnectionRequestResult.Failure -> {
-                    appLogger.e(("Couldn't send a connection request to user ${userId.toLogString()}"))
+                is SendConnectionRequestResult.Success -> {
                     state = state.finishAction()
-                    _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent_error))
+                    _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent))
                 }
 
-                is SendConnectionRequestResult.Success -> {
+                is SendConnectionRequestResult.Failure.FederationDenied -> {
                     state = state.finishAction()
-                    _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent))
+                    _infoMessage.emit(
+                        UIText.StringResource(
+                            R.string.connection_request_sent_federation_denied_error,
+                            userName
+                        )
+                    )
+                }
+
+                is SendConnectionRequestResult.Failure.GenericFailure -> {
+                    state = state.finishAction()
+                    _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent_error))
                 }
             }
         }

diff --git a/...otlin/com/wire/android/ui/home/conversations/details/AddMembersToConversationViewModel.kt b/...otlin/com/wire/android/ui/home/conversations/details/AddMembersToConversationViewModel.kt
@@ -110,7 +110,7 @@ class AddMembersToConversationViewModel @Inject constructor(
         }
     }
 
-    override fun getInitialContacts(): Flow<SearchResult> =
+    override suspend fun getInitialContacts(): Flow<SearchResult> =
         getAllContactsNotInConversation(conversationId).map { result ->
             when (result) {
                 is Result.Failure -> SearchResult.Failure(R.string.label_general_error)

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchPeopleViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchPeopleViewModel.kt
@@ -108,7 +108,7 @@ open class SearchAllPeopleViewModel(
         }
     }
 
-    override fun getInitialContacts(): Flow<SearchResult> = getAllKnownUsers()
+    override suspend fun getInitialContacts(): Flow<SearchResult> = getAllKnownUsers()
         .map { result ->
             when (result) {
                 is GetAllContactsResult.Failure -> SearchResult.Failure(R.string.label_general_error)
@@ -211,13 +211,13 @@ abstract class PublicWithKnownPeopleSearchViewModel(
             val userId = UserId(contact.id, contact.domain)
 
             when (sendConnectionRequest(userId)) {
-                is SendConnectionRequestResult.Failure -> {
-                    appLogger.d(("Couldn't send a connect request to user $userId"))
-                }
-
                 is SendConnectionRequestResult.Success -> {
                     mutableInfoMessage.emit(SearchPeopleMessageType.SuccessConnectionSentRequest.uiText)
                 }
+
+                is SendConnectionRequestResult.Failure.FederationDenied, is SendConnectionRequestResult.Failure.GenericFailure -> {
+                    appLogger.d(("Couldn't send a connect request to user $userId"))
+                }
             }
         }
     }
@@ -250,11 +250,12 @@ abstract class SearchPeopleViewModel : ViewModel() {
         .asStateFlow()
         .debounce(DEFAULT_SEARCH_QUERY_DEBOUNCE)
 
-    fun initialContactResultFlow() = getInitialContacts().map { result ->
+    suspend fun initialContactResultFlow() = getInitialContacts().map { result ->
         when (result) {
             is SearchResult.Failure -> {
                 SearchResultState.Failure(result.failureString)
             }
+
             is SearchResult.Success -> {
                 SearchResultState.Success(
                     result
@@ -324,7 +325,7 @@ abstract class SearchPeopleViewModel : ViewModel() {
         }
     }
 
-    abstract fun getInitialContacts(): Flow<SearchResult>
+    abstract suspend fun getInitialContacts(): Flow<SearchResult>
 
     abstract suspend fun getInitialServices(): Flow<SearchResult>
 }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -767,6 +767,7 @@
     <string name="connection_request_ignored">You ignored %1$s\'s request</string>
     <string name="connection_request_accepted">Connection request accepted</string>
     <string name="connection_request_sent_error">Connection request could not be sent</string>
+    <string name="connection_request_sent_federation_denied_error">Your backend does not federate with the backend of %1$s. You can not connect with them.</string>
     <string name="connection_request_accept_error">Connection request could not be accepted</string>
     <string name="connection_request_ignore_error">Connection request could not be ignored</string>
     <string name="connection_request_cancel_error">Connection request could not be canceled</string>

diff --git a/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
@@ -88,7 +88,7 @@ class ConnectionActionButtonViewModelTest {
     fun `given a failure, when sending a connection request, then emit failure message`() = runTest {
         // given
         val (arrangement, viewModel) = ConnectionActionButtonHiltArrangement()
-            .withSendConnectionRequest(SendConnectionRequestResult.Failure(failure))
+            .withSendConnectionRequest(SendConnectionRequestResult.Failure.GenericFailure(failure))
             .arrange()
 
         viewModel.infoMessage.test {
@@ -103,6 +103,25 @@ class ConnectionActionButtonViewModelTest {
         }
     }
 
+    @Test
+    fun `given a federation denied failure, when sending a connection request, then emit proper failure message`() = runTest {
+        // given
+        val (arrangement, viewModel) = ConnectionActionButtonHiltArrangement()
+            .withSendConnectionRequest(SendConnectionRequestResult.Failure.FederationDenied)
+            .arrange()
+
+        viewModel.infoMessage.test {
+            // when
+            viewModel.onSendConnectionRequest()
+
+            // then
+            val result = awaitItem() as UIText.StringResource
+            assertEquals(UIText.StringResource(R.string.connection_request_sent_federation_denied_error, "").resId, result.resId)
+            coVerify(exactly = 1) { arrangement.sendConnectionRequest.invoke(eq(TestUser.USER_ID)) }
+            assertEquals(false, viewModel.actionableState().isPerformingAction)
+        }
+    }
+
     @Test
     fun `given success, when ignoring a connection request, then calls onIgnoreSuccess`() =
         runTest {

diff --git a/kalium b/kalium