rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review

Browse Source
This commit is contained in:
Valere 2021-09-24 19:35:49 +02:00
parent 8318f2d38f
commit 1fed27961a
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
View File

@ -229,8 +229,6 @@ internal class DefaultIdentityService @Inject constructor(
override fun setUserConsent(newValue: Boolean) { override fun setUserConsent(newValue: Boolean) {
identityStore.setUserConsent(newValue) identityStore.setUserConsent(newValue)
// notify listeners
listeners.toList().forEach { tryOrNull { it.onIdentityServerChange() } }
} }
override suspend fun lookUp(threePids: List<ThreePid>): List<FoundThreePid> { override suspend fun lookUp(threePids: List<ThreePid>): List<FoundThreePid> {

10
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
View File

@ -16,7 +16,6 @@
package im.vector.app.features.userdirectory package im.vector.app.features.userdirectory
import androidx.lifecycle.viewModelScope
import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.ActivityViewModelContext
import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.FragmentViewModelContext
import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.MvRxViewModelFactory
@ -32,7 +31,6 @@ import im.vector.app.core.extensions.toggle
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.MatrixPatterns import org.matrix.android.sdk.api.MatrixPatterns
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.identity.IdentityServiceListener 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.toMatrixItem
import org.matrix.android.sdk.api.util.toOptional import org.matrix.android.sdk.api.util.toOptional
import org.matrix.android.sdk.rx.rx import org.matrix.android.sdk.rx.rx
import timber.log.Timber
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
private typealias KnownUsersSearch = String private typealias KnownUsersSearch = String
@ -121,12 +118,9 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
} }
private fun handleISUpdateConsent(action: UserListAction.UpdateUserConsent) { private fun handleISUpdateConsent(action: UserListAction.UpdateUserConsent) {
viewModelScope.launch {
try {
session.identityService().setUserConsent(action.consent) session.identityService().setUserConsent(action.consent)
} catch (failure: Throwable) { withState {
Timber.d("Failed to update IS consent", failure) identityServerUsersSearch.accept(it.searchTerm)
}
} }
} }