1
0
mirror of https://github.com/vector-im/element-android.git synced 2025-08-09 01:42:06 +03:00

Merge branch 'develop' into feature/aris/threads

# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
This commit is contained in:
ariskotsomitopoulos
2022-01-03 11:08:22 +02:00
73 changed files with 1222 additions and 755 deletions

View File

@@ -152,6 +152,13 @@ class FlowSession(private val session: Session) {
}
}
fun liveUserAccountData(type: String): Flow<Optional<UserAccountDataEvent>> {
return session.accountDataService().getLiveUserAccountDataEvent(type).asFlow()
.startWith(session.coroutineDispatchers.io) {
session.accountDataService().getUserAccountDataEvent(type).toOptional()
}
}
fun liveRoomAccountData(types: Set<String>): Flow<List<RoomAccountDataEvent>> {
return session.accountDataService().getLiveRoomAccountDataEvents(types).asFlow()
.startWith(session.coroutineDispatchers.io) {