Merge feature/replace_paged_list into develop

This commit is contained in:
ganfra
2019-04-01 17:33:53 +02:00
73 changed files with 1486 additions and 1542 deletions

View File

@ -18,7 +18,6 @@ package im.vector.matrix.rx
import im.vector.matrix.android.api.session.room.Room
import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.timeline.TimelineData
import io.reactivex.Observable
class RxRoom(private val room: Room) {
@ -27,10 +26,6 @@ class RxRoom(private val room: Room) {
return room.roomSummary.asObservable()
}
fun timeline(eventId: String? = null): Observable<TimelineData> {
return room.timeline(eventId).asObservable()
}
}
fun Room.rx(): RxRoom {