filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review

This commit is contained in:
Valere 2021-09-22 10:43:39 +02:00
parent 5bb3e22868
commit 91ba17f71b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,9 +101,7 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
} }
private fun cleanISURL(url: String?): String? { private fun cleanISURL(url: String?): String? {
return if (url?.startsWith("https://") == true) { return url?.removePrefix("https://")
url.substring("https://".length)
} else url
} }
override fun onCleared() { override fun onCleared() {
@ -186,15 +184,13 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
displayName = json[ProfileService.DISPLAY_NAME_KEY] as? String, displayName = json[ProfileService.DISPLAY_NAME_KEY] as? String,
avatarUrl = json[ProfileService.AVATAR_URL_KEY] as? String avatarUrl = json[ProfileService.AVATAR_URL_KEY] as? String
) )
).toOptional() )
} }
.onErrorResumeNext { .onErrorResumeNext {
Single.just(ThreePidUser(email = search, user = User(foundThreePid.matrixId)).toOptional()) Single.just(ThreePidUser(email = search, user = User(foundThreePid.matrixId)))
} }
} ?: Single.just(ThreePidUser(email = search, user = null).toOptional()) } ?: Single.just(ThreePidUser(email = search, user = null))
} }
.map { it.getOrNull() }
stream.toAsync { stream.toAsync {
copy(matchingEmail = it) copy(matchingEmail = it)
} }