From 1fed27961a5a5a6ae7fde2543f1182c59e120fbe Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 24 Sep 2021 19:35:49 +0200
Subject: [PATCH] Code review

---
 .../session/identity/DefaultIdentityService.kt       |  2 --
 .../app/features/userdirectory/UserListViewModel.kt  | 12 +++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index 4992081c8e..acd163450c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -229,8 +229,6 @@ internal class DefaultIdentityService @Inject constructor(
 
     override fun setUserConsent(newValue: Boolean) {
         identityStore.setUserConsent(newValue)
-        // notify listeners
-        listeners.toList().forEach { tryOrNull { it.onIdentityServerChange() } }
     }
 
     override suspend fun lookUp(threePids: List<ThreePid>): List<FoundThreePid> {
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index dd045f5d32..dead957795 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.userdirectory
 
-import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -32,7 +31,6 @@ import im.vector.app.core.extensions.toggle
 import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
@@ -42,7 +40,6 @@ import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.rx.rx
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 private typealias KnownUsersSearch = String
@@ -121,12 +118,9 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
     }
 
     private fun handleISUpdateConsent(action: UserListAction.UpdateUserConsent) {
-        viewModelScope.launch {
-            try {
-                session.identityService().setUserConsent(action.consent)
-            } catch (failure: Throwable) {
-                Timber.d("Failed to update IS consent", failure)
-            }
+        session.identityService().setUserConsent(action.consent)
+        withState {
+            identityServerUsersSearch.accept(it.searchTerm)
         }
     }