filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Defensive code against invalid userId

Browse Source
This commit is contained in:
Benoit Marty 2021-04-19 14:11:24 +02:00 committed by Benoit Marty
parent ef55ddd683
commit 63a59dbc0c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
View File

@ -25,10 +25,13 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import kotlinx.coroutines.launch 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.Session
import org.matrix.android.sdk.api.util.MatrixItem
import org.matrix.android.sdk.api.util.toMatrixItem import org.matrix.android.sdk.api.util.toMatrixItem
import org.matrix.android.sdk.rx.rx import org.matrix.android.sdk.rx.rx
import org.matrix.android.sdk.rx.unwrap import org.matrix.android.sdk.rx.unwrap
import timber.log.Timber
class AccountCreatedViewModel @AssistedInject constructor( class AccountCreatedViewModel @AssistedInject constructor(
@Assisted initialState: AccountCreatedViewState, @Assisted initialState: AccountCreatedViewState,
@ -62,7 +65,14 @@ class AccountCreatedViewModel @AssistedInject constructor(
session.rx() session.rx()
.liveUser(session.myUserId) .liveUser(session.myUserId)
.unwrap() .unwrap()
.map { it.toMatrixItem() } .map {
if (MatrixPatterns.isUserId(it.userId)) {
it.toMatrixItem()
} else {
Timber.w("liveUser() has returned an invalid user: $it")
MatrixItem.UserItem(session.myUserId, null, null)
}
}
.execute { .execute {
copy(currentUser = it) copy(currentUser = it)
} }