diff --git a/CHANGES.md b/CHANGES.md index ea78fcaf7d..8783bce6d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,7 @@ Features ✨: Improvements 🙌: - Allow non-HTTPS connections to homeservers on Tor (#2941) - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831) - - Improve initial sync performance (#983) + - Improve initial sync performance - split into 2 transactions (#983) - PIP support for Jitsi call (#2418) - Add tooltip for room quick actions - Pre-share session keys when opening a room or start typing (#2771) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt index 70de026857..6d1d12f1bc 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt @@ -22,9 +22,9 @@ interface FilterService { NoFilter, /** - * Filter for Riot, will include only known event type + * Filter for Element, will include only known event type */ - RiotFilter + ElementFilter } /** diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt index b6bc17eaa0..074f8dc43e 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt @@ -36,7 +36,7 @@ import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory import org.matrix.android.sdk.internal.network.parsing.TlsVersionMoshiAdapter import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter -import org.matrix.android.sdk.internal.session.sync.parsing.DefaultLazyRoomSyncJsonAdapter +import org.matrix.android.sdk.internal.session.sync.parsing.DefaultLazyRoomSyncEphemeralJsonAdapter object MoshiProvider { @@ -46,7 +46,7 @@ object MoshiProvider { .add(CipherSuiteMoshiAdapter()) .add(TlsVersionMoshiAdapter()) // Use addLast here so we can inject a SplitLazyRoomSyncJsonAdapter later to override the default parsing. - .addLast(DefaultLazyRoomSyncJsonAdapter()) + .addLast(DefaultLazyRoomSyncEphemeralJsonAdapter()) .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java) .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT) .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt index 2eac0a5059..7415b988a4 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt @@ -33,11 +33,11 @@ internal object FilterFactory { return FilterUtil.enableLazyLoading(Filter(), true) } - fun createRiotFilter(): Filter { + fun createElementFilter(): Filter { return Filter( room = RoomFilter( - timeline = createRiotTimelineFilter(), - state = createRiotStateFilter() + timeline = createElementTimelineFilter(), + state = createElementStateFilter() ) ) } @@ -48,7 +48,7 @@ internal object FilterFactory { ) } - fun createRiotRoomFilter(): RoomEventFilter { + fun createElementRoomFilter(): RoomEventFilter { return RoomEventFilter( lazyLoadMembers = true // TODO Enable this for optimization @@ -56,26 +56,26 @@ internal object FilterFactory { ) } - private fun createRiotTimelineFilter(): RoomEventFilter { - return RoomEventFilter().apply { + private fun createElementTimelineFilter(): RoomEventFilter? { + return null // RoomEventFilter().apply { // TODO Enable this for optimization // types = listOfSupportedEventTypes.toMutableList() - } + // } } - private fun createRiotStateFilter(): RoomEventFilter { + private fun createElementStateFilter(): RoomEventFilter { return RoomEventFilter( lazyLoadMembers = true ) } - // Get only managed types by Riot + // Get only managed types by Element private val listOfSupportedEventTypes = listOf( // TODO Complete the list EventType.MESSAGE ) - // Get only managed types by Riot + // Get only managed types by Element private val listOfSupportedStateEventTypes = listOf( // TODO Complete the list EventType.STATE_ROOM_MEMBER diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt index da747934e2..d42962d54a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt @@ -42,18 +42,18 @@ internal class DefaultSaveFilterTask @Inject constructor( override suspend fun execute(params: SaveFilterTask.Params) { val filterBody = when (params.filterPreset) { - FilterService.FilterPreset.RiotFilter -> { - FilterFactory.createRiotFilter() + FilterService.FilterPreset.ElementFilter -> { + FilterFactory.createElementFilter() } - FilterService.FilterPreset.NoFilter -> { + FilterService.FilterPreset.NoFilter -> { FilterFactory.createDefaultFilter() } } val roomFilter = when (params.filterPreset) { - FilterService.FilterPreset.RiotFilter -> { - FilterFactory.createRiotRoomFilter() + FilterService.FilterPreset.ElementFilter -> { + FilterFactory.createElementRoomFilter() } - FilterService.FilterPreset.NoFilter -> { + FilterService.FilterPreset.NoFilter -> { FilterFactory.createDefaultRoomFilter() } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt index 4754265c49..54883b51e6 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt @@ -50,7 +50,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor( } val newJoinEvents = params.syncResponse.join .mapNotNull { (key, value) -> - value.roomSync.timeline?.events?.map { it.copy(roomId = key) } + value.timeline?.events?.map { it.copy(roomId = key) } } .flatten() val inviteEvents = params.syncResponse.invite @@ -80,7 +80,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor( val allRedactedEvents = params.syncResponse.join .asSequence() - .mapNotNull { (_, value) -> value.roomSync.timeline?.events } + .mapNotNull { it.value.timeline?.events } .flatten() .filter { it.type == EventType.REDACTION } .mapNotNull { it.redacts } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt index fca92870ca..297cc213ed 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt @@ -41,10 +41,10 @@ sealed class InitialSyncStrategy { */ val minSizeToSplit: Long = 1024 * 1024, /** - * Limit per room to reach to decide to store a join room into a file - * Empiric value: 10 kilobytes + * Limit per room to reach to decide to store a join room ephemeral Events into a file + * Empiric value: 6 kilobytes */ - val minSizeToStoreInFile: Long = 10 * 1024, + val minSizeToStoreInFile: Long = 6 * 1024, /** * Max number of rooms to insert at a time in database (to avoid too much RAM usage) */ diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt index eac5e7e6ba..b2db6320f1 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt @@ -60,10 +60,8 @@ import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync -import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync import org.matrix.android.sdk.internal.session.sync.model.RoomSync import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData -import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse import timber.log.Timber import javax.inject.Inject @@ -81,7 +79,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle private val timelineInput: TimelineInput) { sealed class HandlingStrategy { - data class JOINED(val data: Map) : HandlingStrategy() + data class JOINED(val data: Map) : HandlingStrategy() data class INVITED(val data: Map) : HandlingStrategy() data class LEFT(val data: Map) : HandlingStrategy() } @@ -96,6 +94,19 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, reporter) } + fun handleInitSyncEphemeral(realm: Realm, + roomsSyncResponse: RoomsSyncResponse) { + roomsSyncResponse.join.forEach { roomSync -> + val ephemeralResult = roomSync.value.ephemeral + ?.roomSyncEphemeral + ?.events + ?.takeIf { it.isNotEmpty() } + ?.let { events -> handleEphemeral(realm, roomSync.key, events, true) } + + roomTypingUsersHandler.handle(realm, roomSync.key, ephemeralResult) + } + } + // PRIVATE METHODS ***************************************************************************** private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: ProgressReporter?) { @@ -108,12 +119,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle val rooms = when (handlingStrategy) { is HandlingStrategy.JOINED -> { if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) { - insertJoinRooms(realm, handlingStrategy, insertType, syncLocalTimeStampMillis, reporter) + insertJoinRoomsFromInitSync(realm, handlingStrategy, syncLocalTimeStampMillis, reporter) // Rooms are already inserted, return an empty list emptyList() } else { handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) { - handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis) + handleJoinedRoom(realm, it.key, it.value, true, insertType, syncLocalTimeStampMillis) } } } @@ -131,11 +142,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle realm.insertOrUpdate(rooms) } - private fun insertJoinRooms(realm: Realm, - handlingStrategy: HandlingStrategy.JOINED, - insertType: EventInsertType, - syncLocalTimeStampMillis: Long, - reporter: ProgressReporter?) { + private fun insertJoinRoomsFromInitSync(realm: Realm, + handlingStrategy: HandlingStrategy.JOINED, + syncLocalTimeStampMillis: Long, + reporter: ProgressReporter?) { val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE val listSize = handlingStrategy.data.keys.size val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt() @@ -152,11 +162,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle .also { Timber.v("INIT_SYNC insert ${roomIds.size} rooms") } .map { handleJoinedRoom( - realm, - it, - (handlingStrategy.data[it] ?: error("Should not happen")).roomSync, - insertType, - syncLocalTimeStampMillis + realm = realm, + roomId = it, + roomSync = handlingStrategy.data[it] ?: error("Should not happen"), + handleEphemeralEvents = false, + insertType = EventInsertType.INITIAL_SYNC, + syncLocalTimestampMillis = syncLocalTimeStampMillis ) } realm.insertOrUpdate(roomEntities) @@ -166,7 +177,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle } else { // No need to split val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) { - handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis) + handleJoinedRoom(realm, it.key, it.value, false, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis) } realm.insertOrUpdate(rooms) } @@ -175,13 +186,16 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle private fun handleJoinedRoom(realm: Realm, roomId: String, roomSync: RoomSync, + handleEphemeralEvents: Boolean, insertType: EventInsertType, syncLocalTimestampMillis: Long): RoomEntity { Timber.v("Handle join sync for room $roomId") var ephemeralResult: EphemeralResult? = null - if (roomSync.ephemeral?.events?.isNotEmpty() == true) { - ephemeralResult = handleEphemeral(realm, roomId, roomSync.ephemeral, insertType == EventInsertType.INITIAL_SYNC) + if (handleEphemeralEvents) { + ephemeralResult = roomSync.ephemeral?.roomSyncEphemeral?.events + ?.takeIf { it.isNotEmpty() } + ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC) } } if (roomSync.accountData?.events?.isNotEmpty() == true) { @@ -421,10 +435,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle private fun handleEphemeral(realm: Realm, roomId: String, - ephemeral: RoomSyncEphemeral, + ephemeralEvents: List, isInitialSync: Boolean): EphemeralResult { var result = EphemeralResult() - for (event in ephemeral.events) { + for (event in ephemeralEvents) { when (event.type) { EventType.RECEIPT -> { @Suppress("UNCHECKED_CAST") diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt index 167e45031c..d17a672485 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt @@ -25,10 +25,10 @@ import org.matrix.android.sdk.internal.crypto.DefaultCryptoService import org.matrix.android.sdk.internal.di.SessionDatabase import org.matrix.android.sdk.internal.di.SessionId import org.matrix.android.sdk.internal.di.WorkManagerProvider -import org.matrix.android.sdk.internal.session.initsync.ProgressReporter import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker -import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask +import org.matrix.android.sdk.internal.session.initsync.ProgressReporter import org.matrix.android.sdk.internal.session.initsync.reportSubtask +import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse import org.matrix.android.sdk.internal.session.sync.model.SyncResponse @@ -128,6 +128,15 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private cryptoSyncHandler.onSyncCompleted(syncResponse) } + suspend fun handleInitSyncSecondTransaction(syncResponse: SyncResponse) { + // Start another transaction to handle the ephemeral events + monarchy.awaitTransaction { realm -> + if (syncResponse.rooms != null) { + roomSyncHandler.handleInitSyncEphemeral(realm, syncResponse.rooms) + } + } + } + /** * At the moment we don't get any group data through the sync, so we poll where every hour. * You can also force to refetch group data using [Group] API. diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt index 3d0368ef03..97badfa1e7 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt @@ -28,7 +28,7 @@ import org.matrix.android.sdk.internal.session.filter.FilterRepository import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService import org.matrix.android.sdk.internal.session.initsync.reportSubtask -import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync +import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral import org.matrix.android.sdk.internal.session.sync.model.SyncResponse import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser import org.matrix.android.sdk.internal.session.user.UserStore @@ -98,10 +98,15 @@ internal class DefaultSyncTask @Inject constructor( val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT) if (isInitialSync) { + Timber.v("INIT_SYNC with filter: ${requestParams["filter"]}") val initSyncStrategy = initialSyncStrategy + var syncResp: SyncResponse? = null logDuration("INIT_SYNC strategy: $initSyncStrategy") { if (initSyncStrategy is InitialSyncStrategy.Optimized) { - safeInitialSync(requestParams, initSyncStrategy) + val file = downloadInitSyncResponse(requestParams) + syncResp = reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) { + handleSyncFile(file, initSyncStrategy) + } } else { val syncResponse = logDuration("INIT_SYNC Request") { executeRequest(globalErrorReceiver) { @@ -118,6 +123,15 @@ internal class DefaultSyncTask @Inject constructor( } } initialSyncProgressService.endAll() + + if (initSyncStrategy is InitialSyncStrategy.Optimized) { + logDuration("INIT_SYNC Handle ephemeral") { + syncResponseHandler.handleInitSyncSecondTransaction(syncResp!!) + } + initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS) + // Delete all files + workingDir.deleteRecursively() + } } else { val syncResponse = executeRequest(globalErrorReceiver) { apiCall = syncAPI.sync( @@ -130,12 +144,11 @@ internal class DefaultSyncTask @Inject constructor( Timber.v("Sync task finished on Thread: ${Thread.currentThread().name}") } - private suspend fun safeInitialSync(requestParams: Map, initSyncStrategy: InitialSyncStrategy.Optimized) { + private suspend fun downloadInitSyncResponse(requestParams: Map): File { workingDir.mkdirs() val workingFile = File(workingDir, "initSync.json") val status = initialSyncStatusRepository.getStep() if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) { - // Go directly to the parse step Timber.v("INIT_SYNC file is already here") reportSubtask(initialSyncProgressService, InitSyncStep.Downloading, 1, 0.3f) { // Empty task @@ -164,12 +177,7 @@ internal class DefaultSyncTask @Inject constructor( } initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED) } - reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) { - handleSyncFile(workingFile, initSyncStrategy) - } - - // Delete all files - workingDir.deleteRecursively() + return workingFile } private suspend fun getSyncResponse(requestParams: Map, maxNumberOfRetries: Int): Response { @@ -191,21 +199,21 @@ internal class DefaultSyncTask @Inject constructor( } } - private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized) { - logDuration("INIT_SYNC handleSyncFile()") { + private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized): SyncResponse { + return logDuration("INIT_SYNC handleSyncFile()") { val syncResponse = logDuration("INIT_SYNC Read file and parse") { syncResponseParser.parse(initSyncStrategy, workingFile) } initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED) // Log some stats val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0 - val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it is LazyRoomSync.Stored } - Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files") + val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it.ephemeral is LazyRoomSyncEphemeral.Stored } + Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files") logDuration("INIT_SYNC Database insertion") { syncResponseHandler.handleResponse(syncResponse, null, initialSyncProgressService) } - initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS) + syncResponse } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt similarity index 71% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt index 1f6e3de9a4..938168b5f4 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt @@ -24,18 +24,18 @@ import okio.source import java.io.File @JsonClass(generateAdapter = false) -internal sealed class LazyRoomSync { - data class Parsed(val _roomSync: RoomSync) : LazyRoomSync() - data class Stored(val roomSyncAdapter: JsonAdapter, val file: File) : LazyRoomSync() +internal sealed class LazyRoomSyncEphemeral { + data class Parsed(val _roomSyncEphemeral: RoomSyncEphemeral) : LazyRoomSyncEphemeral() + data class Stored(val roomSyncEphemeralAdapter: JsonAdapter, val file: File) : LazyRoomSyncEphemeral() - val roomSync: RoomSync + val roomSyncEphemeral: RoomSyncEphemeral get() { return when (this) { - is Parsed -> _roomSync + is Parsed -> _roomSyncEphemeral is Stored -> { // Parse the file now file.inputStream().use { pos -> - roomSyncAdapter.fromJson(JsonReader.of(pos.source().buffer()))!! + roomSyncEphemeralAdapter.fromJson(JsonReader.of(pos.source().buffer()))!! } } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt index 212d319139..9aed0d37d6 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt @@ -34,7 +34,7 @@ internal data class RoomSync( /** * The ephemeral events in the room that aren't recorded in the timeline or state of the room (e.g. typing, receipts). */ - @Json(name = "ephemeral") val ephemeral: RoomSyncEphemeral? = null, + @Json(name = "ephemeral") val ephemeral: LazyRoomSyncEphemeral? = null, /** * The account data events for the room (e.g. tags). diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt index a62d80a088..dd2f96c988 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt @@ -24,7 +24,7 @@ internal data class RoomsSyncResponse( /** * Joined rooms: keys are rooms ids. */ - @Json(name = "join") val join: Map = emptyMap(), + @Json(name = "join") val join: Map = emptyMap(), /** * Invitations. The rooms that the user has been invited to: keys are rooms ids. diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt similarity index 82% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt index 951fdf86aa..ef56802a66 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt @@ -22,22 +22,22 @@ import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonWriter import com.squareup.moshi.ToJson import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy -import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync -import org.matrix.android.sdk.internal.session.sync.model.RoomSync +import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral +import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral import timber.log.Timber import java.io.File import java.util.concurrent.atomic.AtomicInteger -internal class DefaultLazyRoomSyncJsonAdapter { +internal class DefaultLazyRoomSyncEphemeralJsonAdapter { @FromJson - fun fromJson(reader: JsonReader, delegate: JsonAdapter): LazyRoomSync? { - val roomSync = delegate.fromJson(reader) ?: return null - return LazyRoomSync.Parsed(roomSync) + fun fromJson(reader: JsonReader, delegate: JsonAdapter): LazyRoomSyncEphemeral? { + val roomSyncEphemeral = delegate.fromJson(reader) ?: return null + return LazyRoomSyncEphemeral.Parsed(roomSyncEphemeral) } @ToJson - fun toJson(writer: JsonWriter, value: LazyRoomSync?) { + fun toJson(writer: JsonWriter, value: LazyRoomSyncEphemeral?) { // This Adapter is not supposed to serialize object Timber.v("To json $value with $writer") throw UnsupportedOperationException() @@ -56,7 +56,7 @@ internal class SplitLazyRoomSyncJsonAdapter( } @FromJson - fun fromJson(reader: JsonReader, delegate: JsonAdapter): LazyRoomSync? { + fun fromJson(reader: JsonReader, delegate: JsonAdapter): LazyRoomSyncEphemeral? { val path = reader.path val json = reader.nextSource().inputStream().bufferedReader().use { it.readText() @@ -67,16 +67,16 @@ internal class SplitLazyRoomSyncJsonAdapter( // Copy the source to a file val file = createFile() file.writeText(json) - LazyRoomSync.Stored(delegate, file) + LazyRoomSyncEphemeral.Stored(delegate, file) } else { Timber.v("INIT_SYNC $path content length: ${json.length} parse it now") val roomSync = delegate.fromJson(json) ?: return null - LazyRoomSync.Parsed(roomSync) + LazyRoomSyncEphemeral.Parsed(roomSync) } } @ToJson - fun toJson(writer: JsonWriter, value: LazyRoomSync?) { + fun toJson(writer: JsonWriter, value: LazyRoomSyncEphemeral?) { // This Adapter is not supposed to serialize object Timber.v("To json $value with $writer") throw UnsupportedOperationException() diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt index 10dade70ea..a21d4ecab3 100644 --- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt @@ -29,7 +29,7 @@ import timber.log.Timber fun Session.configureAndStart(context: Context) { Timber.i("Configure and start session for $myUserId") open() - setFilter(FilterService.FilterPreset.RiotFilter) + setFilter(FilterService.FilterPreset.ElementFilter) startSyncing(context) refreshPushers() }