Revert "Rework injection of monarchy instances (introduce disk and memory)"
This reverts commit af79e1d0b5
.
This commit is contained in:
parent
af79e1d0b5
commit
580c898447
|
@ -28,7 +28,8 @@ class HomeModule(private val homeActivity: HomeActivity) : Module {
|
|||
TextItemFactory()
|
||||
}
|
||||
|
||||
factory { (roomId: String) ->
|
||||
factory {
|
||||
val roomId = it.get(0) as String
|
||||
TimelineEventController(roomId, get(), get(), get())
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ 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 org.koin.android.ext.android.inject
|
||||
import org.koin.core.parameter.parametersOf
|
||||
import org.koin.core.parameter.ParameterList
|
||||
|
||||
class RoomDetailFragment : RiotFragment() {
|
||||
|
||||
|
@ -40,7 +40,7 @@ class RoomDetailFragment : RiotFragment() {
|
|||
private val currentSession = matrix.currentSession
|
||||
private var roomId: String by UnsafeFragmentArgumentDelegate()
|
||||
private var eventId: String? by FragmentArgumentDelegate()
|
||||
private val timelineEventController by inject<TimelineEventController> { parametersOf(roomId) }
|
||||
private val timelineEventController by inject<TimelineEventController>(parameters = { ParameterList(roomId) })
|
||||
private lateinit var room: Room
|
||||
private lateinit var scrollOnNewMessageCallback: ScrollOnNewMessageCallback
|
||||
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
package im.vector.matrix.android.internal.database
|
||||
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
|
||||
data class DatabaseInstances(
|
||||
val disk: Monarchy,
|
||||
val inMemory: Monarchy
|
||||
)
|
|
@ -1,41 +0,0 @@
|
|||
package im.vector.matrix.android.internal.database
|
||||
|
||||
import android.content.Context
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.auth.data.SessionParams
|
||||
import im.vector.matrix.android.internal.session.DefaultSession
|
||||
import io.realm.RealmConfiguration
|
||||
import org.koin.dsl.context.ModuleDefinition
|
||||
import org.koin.dsl.module.Module
|
||||
import org.koin.dsl.module.module
|
||||
import java.io.File
|
||||
|
||||
class DatabaseModule : Module {
|
||||
|
||||
override fun invoke(): ModuleDefinition = module {
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
val context = get<Context>()
|
||||
val sessionParams = get<SessionParams>()
|
||||
val directory = File(context.filesDir, sessionParams.credentials.userId)
|
||||
|
||||
val diskConfiguration = RealmConfiguration.Builder()
|
||||
.directory(directory)
|
||||
.name("disk_store.realm")
|
||||
.deleteRealmIfMigrationNeeded()
|
||||
.build()
|
||||
|
||||
val inMemoryConfiguration = RealmConfiguration.Builder()
|
||||
.directory(directory)
|
||||
.name("in_memory_store.realm")
|
||||
.inMemory()
|
||||
.build()
|
||||
|
||||
DatabaseInstances(
|
||||
disk = Monarchy.Builder().setRealmConfiguration(diskConfiguration).build(),
|
||||
inMemory = Monarchy.Builder().setRealmConfiguration(inMemoryConfiguration).build()
|
||||
)
|
||||
}
|
||||
|
||||
}.invoke()
|
||||
}
|
|
@ -3,7 +3,6 @@ package im.vector.matrix.android.internal.session
|
|||
import android.arch.lifecycle.LiveData
|
||||
import android.os.Looper
|
||||
import android.support.annotation.MainThread
|
||||
import im.vector.matrix.android.api.auth.data.SessionParams
|
||||
import im.vector.matrix.android.api.session.Session
|
||||
import im.vector.matrix.android.api.session.group.Group
|
||||
import im.vector.matrix.android.api.session.group.GroupService
|
||||
|
@ -11,7 +10,7 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary
|
|||
import im.vector.matrix.android.api.session.room.Room
|
||||
import im.vector.matrix.android.api.session.room.RoomService
|
||||
import im.vector.matrix.android.api.session.room.model.RoomSummary
|
||||
import im.vector.matrix.android.internal.database.DatabaseModule
|
||||
import im.vector.matrix.android.api.auth.data.SessionParams
|
||||
import im.vector.matrix.android.internal.database.LiveEntityObserver
|
||||
import im.vector.matrix.android.internal.session.group.GroupModule
|
||||
import im.vector.matrix.android.internal.session.room.RoomModule
|
||||
|
@ -47,8 +46,7 @@ internal class DefaultSession(override val sessionParams: SessionParams) : Sessi
|
|||
val syncModule = SyncModule()
|
||||
val roomModule = RoomModule()
|
||||
val groupModule = GroupModule()
|
||||
val databaseModule = DatabaseModule()
|
||||
StandAloneContext.loadKoinModules(listOf(sessionModule, syncModule, roomModule, groupModule, databaseModule))
|
||||
StandAloneContext.loadKoinModules(listOf(sessionModule, syncModule, roomModule, groupModule))
|
||||
scope = getKoin().getOrCreateScope(SCOPE)
|
||||
liveEntityUpdaters.forEach { it.start() }
|
||||
syncThread.start()
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package im.vector.matrix.android.internal.session
|
||||
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.auth.data.SessionParams
|
||||
import im.vector.matrix.android.api.session.group.GroupService
|
||||
import im.vector.matrix.android.api.session.room.RoomService
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.database.LiveEntityObserver
|
||||
import im.vector.matrix.android.internal.session.events.prune.EventsPruner
|
||||
import im.vector.matrix.android.internal.session.group.DefaultGroupService
|
||||
|
@ -13,6 +13,7 @@ import im.vector.matrix.android.internal.session.room.RoomAvatarResolver
|
|||
import im.vector.matrix.android.internal.session.room.RoomSummaryUpdater
|
||||
import im.vector.matrix.android.internal.session.room.members.RoomDisplayNameResolver
|
||||
import im.vector.matrix.android.internal.session.room.members.RoomMemberDisplayNameResolver
|
||||
import io.realm.RealmConfiguration
|
||||
import org.koin.dsl.context.ModuleDefinition
|
||||
import org.koin.dsl.module.Module
|
||||
import org.koin.dsl.module.module
|
||||
|
@ -27,7 +28,20 @@ internal class SessionModule(private val sessionParams: SessionParams) : Module
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
val retrofitBuilder = get<Retrofit.Builder>()
|
||||
RealmConfiguration.Builder()
|
||||
.name(sessionParams.credentials.userId)
|
||||
.deleteRealmIfMigrationNeeded()
|
||||
.build()
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
Monarchy.Builder()
|
||||
.setRealmConfiguration(get())
|
||||
.build()
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
val retrofitBuilder = get() as Retrofit.Builder
|
||||
retrofitBuilder
|
||||
.baseUrl(sessionParams.homeServerConnectionConfig.homeServerUri.toString())
|
||||
.build()
|
||||
|
@ -38,27 +52,26 @@ internal class SessionModule(private val sessionParams: SessionParams) : Module
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
RoomDisplayNameResolver(get<DatabaseInstances>().disk, get(), sessionParams.credentials)
|
||||
RoomDisplayNameResolver(get(), get(), sessionParams.credentials)
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
RoomAvatarResolver(get<DatabaseInstances>().disk, sessionParams.credentials)
|
||||
RoomAvatarResolver(get(), sessionParams.credentials)
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
DefaultRoomService(get<DatabaseInstances>().disk) as RoomService
|
||||
DefaultRoomService(get()) as RoomService
|
||||
}
|
||||
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
DefaultGroupService(get<DatabaseInstances>().disk) as GroupService
|
||||
DefaultGroupService(get()) as GroupService
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
val disk = get<DatabaseInstances>().disk
|
||||
val roomSummaryUpdater = RoomSummaryUpdater(disk, get(), get(), get(), sessionParams.credentials)
|
||||
val groupSummaryUpdater = GroupSummaryUpdater(disk)
|
||||
val eventsPruner = EventsPruner(disk)
|
||||
val roomSummaryUpdater = RoomSummaryUpdater(get(), get(), get(), get(), sessionParams.credentials)
|
||||
val groupSummaryUpdater = GroupSummaryUpdater(get())
|
||||
val eventsPruner = EventsPruner(get())
|
||||
listOf<LiveEntityObserver>(roomSummaryUpdater, groupSummaryUpdater, eventsPruner)
|
||||
}
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ import androidx.work.Worker
|
|||
import androidx.work.WorkerParameters
|
||||
import arrow.core.Option
|
||||
import com.squareup.moshi.JsonClass
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.session.events.model.Event
|
||||
import im.vector.matrix.android.api.session.events.model.EventType
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.database.mapper.asDomain
|
||||
import im.vector.matrix.android.internal.database.mapper.asEntity
|
||||
import im.vector.matrix.android.internal.database.model.EventEntity
|
||||
|
@ -29,13 +29,13 @@ internal class PruneEventWorker(context: Context,
|
|||
val deletionIndexes: List<Int>
|
||||
)
|
||||
|
||||
private val dbInstances by inject<DatabaseInstances>()
|
||||
private val monarchy by inject<Monarchy>()
|
||||
|
||||
override fun doWork(): Result {
|
||||
val params = WorkerParamsFactory.fromData<Params>(inputData)
|
||||
?: return Result.FAILURE
|
||||
?: return Result.FAILURE
|
||||
|
||||
val result = dbInstances.disk.tryTransactionAsync { realm ->
|
||||
val result = monarchy.tryTransactionAsync { realm ->
|
||||
params.updateIndexes.forEach { index ->
|
||||
val data = params.redactionEvents[index]
|
||||
pruneEvent(realm, data)
|
||||
|
@ -49,7 +49,7 @@ internal class PruneEventWorker(context: Context,
|
|||
return
|
||||
}
|
||||
val eventToPrune = EventEntity.where(realm, eventId = redactionEvent.redacts).findFirst()?.asDomain()
|
||||
?: return
|
||||
?: return
|
||||
|
||||
val allowedKeys = computeAllowedKeys(eventToPrune.type)
|
||||
val prunedContent = allowedKeys.fold(
|
||||
|
@ -63,22 +63,22 @@ internal class PruneEventWorker(context: Context,
|
|||
private fun computeAllowedKeys(type: String): Option<List<String>> {
|
||||
// Add filtered content, allowed keys in content depends on the event type
|
||||
val result = when (type) {
|
||||
EventType.STATE_ROOM_MEMBER -> listOf("membership")
|
||||
EventType.STATE_ROOM_CREATE -> listOf("creator")
|
||||
EventType.STATE_ROOM_JOIN_RULES -> listOf("join_rule")
|
||||
EventType.STATE_ROOM_MEMBER -> listOf("membership")
|
||||
EventType.STATE_ROOM_CREATE -> listOf("creator")
|
||||
EventType.STATE_ROOM_JOIN_RULES -> listOf("join_rule")
|
||||
EventType.STATE_ROOM_POWER_LEVELS -> listOf("users",
|
||||
"users_default",
|
||||
"events",
|
||||
"events_default",
|
||||
"state_default",
|
||||
"ban",
|
||||
"kick",
|
||||
"redact",
|
||||
"invite")
|
||||
EventType.STATE_ROOM_ALIASES -> listOf("aliases")
|
||||
EventType.STATE_CANONICAL_ALIAS -> listOf("alias")
|
||||
EventType.FEEDBACK -> listOf("type", "target_event_id")
|
||||
else -> null
|
||||
"users_default",
|
||||
"events",
|
||||
"events_default",
|
||||
"state_default",
|
||||
"ban",
|
||||
"kick",
|
||||
"redact",
|
||||
"invite")
|
||||
EventType.STATE_ROOM_ALIASES -> listOf("aliases")
|
||||
EventType.STATE_CANONICAL_ALIAS -> listOf("alias")
|
||||
EventType.FEEDBACK -> listOf("type", "target_event_id")
|
||||
else -> null
|
||||
}
|
||||
return Option.fromNullable(result)
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package im.vector.matrix.android.internal.session.group
|
||||
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.session.DefaultSession
|
||||
import org.koin.dsl.context.ModuleDefinition
|
||||
import org.koin.dsl.module.Module
|
||||
|
@ -17,7 +16,7 @@ class GroupModule : Module {
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
GetGroupDataRequest(get(), get<DatabaseInstances>().disk, get(), get())
|
||||
GetGroupDataRequest(get(), get(), get(), get())
|
||||
}
|
||||
|
||||
}.invoke()
|
||||
|
|
|
@ -3,6 +3,7 @@ package im.vector.matrix.android.internal.session.room
|
|||
import android.arch.lifecycle.LiveData
|
||||
import android.arch.lifecycle.Transformations
|
||||
import android.arch.paging.PagedList
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.MatrixCallback
|
||||
import im.vector.matrix.android.api.session.events.model.EnrichedEvent
|
||||
import im.vector.matrix.android.api.session.events.model.Event
|
||||
|
@ -13,7 +14,6 @@ import im.vector.matrix.android.api.session.room.model.Membership
|
|||
import im.vector.matrix.android.api.session.room.model.MyMembership
|
||||
import im.vector.matrix.android.api.session.room.model.RoomSummary
|
||||
import im.vector.matrix.android.api.util.Cancelable
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.database.mapper.asDomain
|
||||
import im.vector.matrix.android.internal.database.model.RoomEntity
|
||||
import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
|
||||
|
@ -32,12 +32,12 @@ internal data class DefaultRoom(
|
|||
|
||||
private val loadRoomMembersRequest by inject<LoadRoomMembersRequest>()
|
||||
private val syncTokenStore by inject<SyncTokenStore>()
|
||||
private val dbInstances by inject<DatabaseInstances>()
|
||||
private val timelineHolder by inject<TimelineHolder> { parametersOf(roomId) }
|
||||
private val sendService by inject<SendService> { parametersOf(roomId) }
|
||||
private val monarchy by inject<Monarchy>()
|
||||
private val timelineHolder by inject<TimelineHolder>(parameters = { parametersOf(roomId) })
|
||||
private val sendService by inject<SendService>(parameters = { parametersOf(roomId) })
|
||||
|
||||
override val roomSummary: LiveData<RoomSummary> by lazy {
|
||||
val liveData = dbInstances.disk
|
||||
val liveData = monarchy
|
||||
.findAllMappedWithChanges(
|
||||
{ realm -> RoomSummaryEntity.where(realm, roomId).isNotEmpty(RoomSummaryEntityFields.DISPLAY_NAME) },
|
||||
{ from -> from.asDomain() })
|
||||
|
@ -61,10 +61,10 @@ internal data class DefaultRoom(
|
|||
}
|
||||
|
||||
private fun areAllMembersLoaded(): Boolean {
|
||||
return dbInstances.disk
|
||||
.fetchAllCopiedSync { RoomEntity.where(it, roomId) }
|
||||
.firstOrNull()
|
||||
?.areAllMembersLoaded ?: false
|
||||
return monarchy
|
||||
.fetchAllCopiedSync { RoomEntity.where(it, roomId) }
|
||||
.firstOrNull()
|
||||
?.areAllMembersLoaded ?: false
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package im.vector.matrix.android.internal.session.room
|
||||
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.auth.data.Credentials
|
||||
import im.vector.matrix.android.api.session.events.model.EventType
|
||||
import im.vector.matrix.android.api.session.room.Room
|
||||
import im.vector.matrix.android.api.session.room.model.MyMembership
|
||||
import im.vector.matrix.android.api.session.room.model.RoomAvatarContent
|
||||
import im.vector.matrix.android.api.auth.data.Credentials
|
||||
import im.vector.matrix.android.internal.database.mapper.asDomain
|
||||
import im.vector.matrix.android.internal.database.model.EventEntity
|
||||
import im.vector.matrix.android.internal.database.query.last
|
||||
|
|
|
@ -4,14 +4,12 @@ import im.vector.matrix.android.api.auth.data.SessionParams
|
|||
import im.vector.matrix.android.api.session.room.SendService
|
||||
import im.vector.matrix.android.api.session.room.TimelineHolder
|
||||
import im.vector.matrix.android.api.session.room.send.EventFactory
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.session.DefaultSession
|
||||
import im.vector.matrix.android.internal.session.room.members.LoadRoomMembersRequest
|
||||
import im.vector.matrix.android.internal.session.room.send.DefaultSendService
|
||||
import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineHolder
|
||||
import im.vector.matrix.android.internal.session.room.timeline.PaginationRequest
|
||||
import im.vector.matrix.android.internal.session.room.timeline.TimelineBoundaryCallback
|
||||
import im.vector.matrix.android.internal.util.PagingRequestHelper
|
||||
import org.koin.dsl.context.ModuleDefinition
|
||||
import org.koin.dsl.module.Module
|
||||
import org.koin.dsl.module.module
|
||||
|
@ -29,11 +27,18 @@ class RoomModule : Module {
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
LoadRoomMembersRequest(get(), get<DatabaseInstances>().disk, get())
|
||||
LoadRoomMembersRequest(get(), get(), get())
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
PaginationRequest(get(), get<DatabaseInstances>().disk, get())
|
||||
PaginationRequest(get(), get(), get())
|
||||
}
|
||||
|
||||
|
||||
factory {
|
||||
val roomId: String = it[0]
|
||||
val timelineBoundaryCallback = TimelineBoundaryCallback(roomId, get(), get(), Executors.newSingleThreadExecutor())
|
||||
DefaultTimelineHolder(roomId, get(), timelineBoundaryCallback) as TimelineHolder
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
|
@ -41,14 +46,9 @@ class RoomModule : Module {
|
|||
EventFactory(sessionParams.credentials)
|
||||
}
|
||||
|
||||
factory { (roomId: String) ->
|
||||
val helper = PagingRequestHelper(Executors.newSingleThreadExecutor())
|
||||
val timelineBoundaryCallback = TimelineBoundaryCallback(roomId, get(), get<DatabaseInstances>().disk, helper)
|
||||
DefaultTimelineHolder(roomId, get<DatabaseInstances>().disk, timelineBoundaryCallback) as TimelineHolder
|
||||
}
|
||||
|
||||
factory { (roomId: String) ->
|
||||
DefaultSendService(roomId, get(), get<DatabaseInstances>().disk) as SendService
|
||||
factory {
|
||||
val roomId: String = it[0]
|
||||
DefaultSendService(roomId, get(), get()) as SendService
|
||||
}
|
||||
|
||||
}.invoke()
|
||||
|
|
|
@ -19,13 +19,13 @@ package im.vector.matrix.android.internal.session.room.members
|
|||
import android.content.Context
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.R
|
||||
import im.vector.matrix.android.api.auth.data.Credentials
|
||||
import im.vector.matrix.android.api.session.events.model.EventType
|
||||
import im.vector.matrix.android.api.session.room.Room
|
||||
import im.vector.matrix.android.api.session.room.model.MyMembership
|
||||
import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
|
||||
import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
|
||||
import im.vector.matrix.android.api.session.room.model.RoomNameContent
|
||||
import im.vector.matrix.android.api.auth.data.Credentials
|
||||
import im.vector.matrix.android.internal.database.mapper.asDomain
|
||||
import im.vector.matrix.android.internal.database.model.EventEntity
|
||||
import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
|
||||
|
|
|
@ -4,8 +4,8 @@ import android.content.Context
|
|||
import androidx.work.Worker
|
||||
import androidx.work.WorkerParameters
|
||||
import com.squareup.moshi.JsonClass
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.session.events.model.Event
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.database.model.EventEntity
|
||||
import im.vector.matrix.android.internal.database.query.where
|
||||
import im.vector.matrix.android.internal.network.executeRequest
|
||||
|
@ -26,12 +26,12 @@ internal class SendEventWorker(context: Context, params: WorkerParameters)
|
|||
)
|
||||
|
||||
private val roomAPI by inject<RoomAPI>()
|
||||
private val dbInstances by inject<DatabaseInstances>()
|
||||
private val monarchy by inject<Monarchy>()
|
||||
|
||||
override fun doWork(): Result {
|
||||
|
||||
val params = WorkerParamsFactory.fromData<Params>(inputData)
|
||||
?: return Result.FAILURE
|
||||
?: return Result.FAILURE
|
||||
|
||||
if (params.event.eventId == null) {
|
||||
return Result.FAILURE
|
||||
|
@ -46,7 +46,7 @@ internal class SendEventWorker(context: Context, params: WorkerParameters)
|
|||
)
|
||||
}
|
||||
result.flatMap { sendResponse ->
|
||||
dbInstances.disk.tryTransactionSync { realm ->
|
||||
monarchy.tryTransactionSync { realm ->
|
||||
val dummyEventEntity = EventEntity.where(realm, params.event.eventId).findFirst()
|
||||
dummyEventEntity?.eventId = sendResponse.eventId
|
||||
}
|
||||
|
|
|
@ -31,6 +31,9 @@ internal class DefaultTimelineHolder(private val roomId: String,
|
|||
}
|
||||
|
||||
override fun timeline(eventId: String?): LiveData<PagedList<EnrichedEvent>> {
|
||||
if (eventId != null) {
|
||||
fetchEventIfNeeded()
|
||||
}
|
||||
val realmDataSourceFactory = monarchy.createDataSourceFactory {
|
||||
buildDataSourceFactoryQuery(it, eventId)
|
||||
}
|
||||
|
@ -57,21 +60,18 @@ internal class DefaultTimelineHolder(private val roomId: String,
|
|||
return monarchy.findAllPagedWithChanges(realmDataSourceFactory, livePagedListBuilder)
|
||||
}
|
||||
|
||||
private fun fetchEventIfNeeded() {
|
||||
|
||||
}
|
||||
|
||||
private fun buildDataSourceFactoryQuery(realm: Realm, eventId: String?): RealmQuery<EventEntity> {
|
||||
val query = if (eventId == null) {
|
||||
EventEntity
|
||||
.where(realm, roomId = roomId)
|
||||
.equalTo("${EventEntityFields.CHUNK}.${ChunkEntityFields.IS_LAST}", true)
|
||||
} else {
|
||||
val event = EventEntity.where(realm, eventId = eventId).findFirst()
|
||||
val permalinkRealm: Realm
|
||||
if (event == null) {
|
||||
permalinkRealm = realm
|
||||
} else {
|
||||
permalinkRealm = realm
|
||||
}
|
||||
EventEntity
|
||||
.where(permalinkRealm, roomId = roomId)
|
||||
.where(realm, roomId = roomId)
|
||||
.`in`("${EventEntityFields.CHUNK}.${ChunkEntityFields.EVENTS.EVENT_ID}", arrayOf(eventId))
|
||||
}
|
||||
return query.sort(EventEntityFields.DISPLAY_INDEX)
|
||||
|
|
|
@ -13,9 +13,11 @@ import java.util.concurrent.Executor
|
|||
internal class TimelineBoundaryCallback(private val roomId: String,
|
||||
private val paginationRequest: PaginationRequest,
|
||||
private val monarchy: Monarchy,
|
||||
private val helper: PagingRequestHelper
|
||||
ioExecutor: Executor
|
||||
) : PagedList.BoundaryCallback<EnrichedEvent>() {
|
||||
|
||||
private val helper = PagingRequestHelper(ioExecutor)
|
||||
|
||||
var limit = 10
|
||||
|
||||
override fun onZeroItemsLoaded() {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package im.vector.matrix.android.internal.session.sync
|
||||
|
||||
import im.vector.matrix.android.internal.database.DatabaseInstances
|
||||
import im.vector.matrix.android.internal.session.DefaultSession
|
||||
import im.vector.matrix.android.internal.session.sync.job.SyncThread
|
||||
import org.koin.dsl.context.ModuleDefinition
|
||||
|
@ -23,15 +22,15 @@ internal class SyncModule : Module {
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
RoomSyncHandler(get<DatabaseInstances>().disk, get())
|
||||
RoomSyncHandler(get(), get())
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
GroupSyncHandler(get<DatabaseInstances>().disk)
|
||||
GroupSyncHandler(get())
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
UserAccountDataSyncHandler(get<DatabaseInstances>().disk)
|
||||
UserAccountDataSyncHandler(get())
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
|
@ -43,7 +42,7 @@ internal class SyncModule : Module {
|
|||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
SyncTokenStore(get<DatabaseInstances>().disk)
|
||||
SyncTokenStore(get())
|
||||
}
|
||||
|
||||
scope(DefaultSession.SCOPE) {
|
||||
|
|
|
@ -1,23 +1,25 @@
|
|||
package im.vector.matrix.android.internal.session.sync
|
||||
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.internal.database.model.SyncEntity
|
||||
import io.realm.Realm
|
||||
import io.realm.RealmConfiguration
|
||||
|
||||
internal class SyncTokenStore(private val monarchy: Monarchy) {
|
||||
internal class SyncTokenStore(private val realmConfiguration: RealmConfiguration) {
|
||||
|
||||
fun getLastToken(): String? {
|
||||
var token: String? = null
|
||||
monarchy.doWithRealm { realm ->
|
||||
token = realm.where(SyncEntity::class.java).findFirst()?.nextBatch
|
||||
}
|
||||
val realm = Realm.getInstance(realmConfiguration)
|
||||
val token = realm.where(SyncEntity::class.java).findFirst()?.nextBatch
|
||||
realm.close()
|
||||
return token
|
||||
}
|
||||
|
||||
fun saveToken(token: String?) {
|
||||
monarchy.writeAsync {
|
||||
val realm = Realm.getInstance(realmConfiguration)
|
||||
realm.executeTransaction {
|
||||
val sync = SyncEntity(token)
|
||||
it.insertOrUpdate(sync)
|
||||
}
|
||||
realm.close()
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue