mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-25 12:17:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Some formatting and cleanup

Browse source
This commit is contained in:
Benoit Marty 2021-04-20 17:33:57 +02:00
parent f086f0e083
commit 820531120a
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
View file

@ -112,7 +112,10 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
private fun PermalinkData.RoomLink.getRoomId(): Single<Optional<String>> { private fun PermalinkData.RoomLink.getRoomId(): Single<Optional<String>> {
val session = activeSessionHolder.getSafeActiveSession() val session = activeSessionHolder.getSafeActiveSession()
return if (isRoomAlias && session != null) { return if (isRoomAlias && session != null) {
session.rx().getRoomIdByAlias(roomIdOrAlias, true).map { it.getOrNull()?.roomId.toOptional() }.subscribeOn(Schedulers.io()) session.rx()
.getRoomIdByAlias(roomIdOrAlias, true)
.map { it.getOrNull()?.roomId.toOptional() }
.subscribeOn(Schedulers.io())
} else { } else {
Single.just(Optional.from(roomIdOrAlias)) Single.just(Optional.from(roomIdOrAlias))
} }

22
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
View file

@ -144,15 +144,19 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
} }
.onErrorReturn { Optional.empty() } .onErrorReturn { Optional.empty() }
Single.zip(searchObservable, profileObservable, { searchResults, optionalProfile -> Single.zip(
val profile = optionalProfile.getOrNull() ?: return@zip searchResults searchObservable,
val searchContainsProfile = searchResults.indexOfFirst { it.userId == profile.userId } != -1 profileObservable,
if (searchContainsProfile) { { searchResults, optionalProfile ->
searchResults val profile = optionalProfile.getOrNull() ?: return@zip searchResults
} else { val searchContainsProfile = searchResults.any { it.userId == profile.userId }
listOf(profile) + searchResults if (searchContainsProfile) {
} searchResults
}) } else {
listOf(profile) + searchResults
}
}
)
} }
} }
stream.toAsync { stream.toAsync {