Merge branch 'develop' into feature/dagger [WIP]

2019-06-26 20:58:46 +02:00
parent 6e7adaec59 33f17e4c5c
commit b2d2582e0f
354 changed files with 12548 additions and 3924 deletions
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
@ -24,7 +24,7 @@ import io.reactivex.Observable
 class RxRoom(private val room: Room) {

    fun liveRoomSummary(): Observable<RoomSummary> {
-        return room.roomSummary.asObservable()
+        return room.liveRoomSummary.asObservable()
    }

    fun liveRoomMemberIds(): Observable<List<String>> {