forked from GitHub-Mirror/riotX-android
Clean files and check if session is open
This commit is contained in:
parent
4cf8f1513b
commit
455b860f06
@ -1,17 +0,0 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
|
||||||
|
|
||||||
import android.support.v7.util.DiffUtil
|
|
||||||
import im.vector.matrix.android.api.session.events.model.EnrichedEvent
|
|
||||||
|
|
||||||
class EventDiffUtilCallback : DiffUtil.ItemCallback<EnrichedEvent>() {
|
|
||||||
|
|
||||||
override fun areItemsTheSame(p0: EnrichedEvent, p1: EnrichedEvent): Boolean {
|
|
||||||
return p0.root.eventId == p1.root.eventId
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun areContentsTheSame(p0: EnrichedEvent, p1: EnrichedEvent): Boolean {
|
|
||||||
return p0.root == p1.root
|
|
||||||
&& p0.metadata == p1.metadata
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -16,6 +16,7 @@ import im.vector.riotredesign.core.platform.RiotFragment
|
|||||||
import im.vector.riotredesign.core.platform.ToolbarConfigurable
|
import im.vector.riotredesign.core.platform.ToolbarConfigurable
|
||||||
import im.vector.riotredesign.core.utils.FragmentArgumentDelegate
|
import im.vector.riotredesign.core.utils.FragmentArgumentDelegate
|
||||||
import im.vector.riotredesign.features.home.AvatarRenderer
|
import im.vector.riotredesign.features.home.AvatarRenderer
|
||||||
|
import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
|
||||||
import kotlinx.android.synthetic.main.fragment_room_detail.*
|
import kotlinx.android.synthetic.main.fragment_room_detail.*
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
package im.vector.riotredesign.features.home.room.detail.timeline
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.widget.FrameLayout
|
import android.widget.FrameLayout
|
@ -1,4 +1,4 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
package im.vector.riotredesign.features.home.room.detail.timeline
|
||||||
|
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import im.vector.riotredesign.R
|
import im.vector.riotredesign.R
|
@ -1,4 +1,4 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
package im.vector.riotredesign.features.home.room.detail.timeline
|
||||||
|
|
||||||
import android.arch.paging.PagedList
|
import android.arch.paging.PagedList
|
||||||
import android.content.Context
|
import android.content.Context
|
@ -1,4 +1,4 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
package im.vector.riotredesign.features.home.room.detail.timeline
|
||||||
|
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import im.vector.riotredesign.R
|
import im.vector.riotredesign.R
|
@ -1,4 +1,4 @@
|
|||||||
package im.vector.riotredesign.features.home.room.detail
|
package im.vector.riotredesign.features.home.room.detail.timeline
|
||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
@ -39,6 +39,7 @@ class LoginActivity : RiotActivity() {
|
|||||||
authenticator.authenticate(homeServerConnectionConfig, login, password, object : MatrixCallback<Session> {
|
authenticator.authenticate(homeServerConnectionConfig, login, password, object : MatrixCallback<Session> {
|
||||||
override fun onSuccess(data: Session) {
|
override fun onSuccess(data: Session) {
|
||||||
matrix.currentSession = data
|
matrix.currentSession = data
|
||||||
|
matrix.currentSession.open()
|
||||||
goToHome()
|
goToHome()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,26 +60,32 @@ class DefaultSession(override val sessionParams: SessionParams) : Session, KoinC
|
|||||||
// ROOM SERVICE
|
// ROOM SERVICE
|
||||||
|
|
||||||
override fun getRoom(roomId: String): Room? {
|
override fun getRoom(roomId: String): Room? {
|
||||||
|
assert(isOpen)
|
||||||
return roomService.getRoom(roomId)
|
return roomService.getRoom(roomId)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getAllRooms(): List<Room> {
|
override fun getAllRooms(): List<Room> {
|
||||||
|
assert(isOpen)
|
||||||
return roomService.getAllRooms()
|
return roomService.getAllRooms()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun liveRooms(): LiveData<List<Room>> {
|
override fun liveRooms(): LiveData<List<Room>> {
|
||||||
|
assert(isOpen)
|
||||||
return roomService.liveRooms()
|
return roomService.liveRooms()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun liveRoomSummaries(): LiveData<List<RoomSummary>> {
|
override fun liveRoomSummaries(): LiveData<List<RoomSummary>> {
|
||||||
|
assert(isOpen)
|
||||||
return roomService.liveRoomSummaries()
|
return roomService.liveRoomSummaries()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun lastSelectedRoom(): RoomSummary? {
|
override fun lastSelectedRoom(): RoomSummary? {
|
||||||
|
assert(isOpen)
|
||||||
return roomService.lastSelectedRoom()
|
return roomService.lastSelectedRoom()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun saveLastSelectedRoom(roomSummary: RoomSummary) {
|
override fun saveLastSelectedRoom(roomSummary: RoomSummary) {
|
||||||
|
assert(isOpen)
|
||||||
roomService.saveLastSelectedRoom(roomSummary)
|
roomService.saveLastSelectedRoom(roomSummary)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user