Timeline: re-add usage of TimelineSettings

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt

@@ -29,6 +29,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.internal.closeQuietly
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHandler
@@ -42,6 +43,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 internal class DefaultTimeline internal constructor(private val roomId: String,
                                                     private val initialEventId: String?,
+                                                    private val settings: TimelineSettings,
                                                     private val realmConfiguration: RealmConfiguration,
                                                     private val loadRoomMembersTask: LoadRoomMembersTask,
                                                     private val readReceiptHandler: ReadReceiptHandler,
@@ -70,6 +72,7 @@ internal class DefaultTimeline internal constructor(private val roomId: String,
 
     private val strategyDependencies = LoadTimelineStrategy.Dependencies(
             eventDecryptor = eventDecryptor,
+            timelineSettings = settings,
             paginationTask = paginationTask,
             fetchTokenAndPaginateTask = fetchTokenAndPaginateTask,
             timelineInput = timelineInput,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt

@@ -64,6 +64,7 @@ internal class DefaultTimelineService @AssistedInject constructor(
         return DefaultTimeline(
                 roomId = roomId,
                 initialEventId = eventId,
+                settings = settings,
                 realmConfiguration = monarchy.realmConfiguration,
                 paginationTask = paginationTask,
                 timelineEventMapper = timelineEventMapper,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt

@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
@@ -39,8 +40,6 @@ import java.util.concurrent.atomic.AtomicReference
  * Once we got a ChunkEntity we wrap it with TimelineChunk class so we dispatch any methods for loading data.
  */
 
-private const val INITIAL_LOAD_COUNT = 30L
-
 internal class LoadTimelineStrategy(
         private val roomId: String,
         private val timelineId: String,
@@ -61,6 +60,7 @@ internal class LoadTimelineStrategy(
     }
 
     data class Dependencies(
+            val timelineSettings: TimelineSettings,
             val realm: AtomicReference<Realm>,
             val eventDecryptor: TimelineEventDecryptor,
             val paginationTask: PaginationTask,
@@ -136,7 +136,7 @@ internal class LoadTimelineStrategy(
             timelineChunk = it.createTimelineChunk()
         }
         if (mode is Mode.Live) {
-            loadMore(INITIAL_LOAD_COUNT, Timeline.Direction.BACKWARDS)
+            loadMore(dependencies.timelineSettings.initialSize.toLong(), Timeline.Direction.BACKWARDS)
         }
     }
 
@@ -202,6 +202,7 @@ internal class LoadTimelineStrategy(
         return firstOrNull()?.let {
             return TimelineChunk(
                     chunkEntity = it,
+                    timelineSettings = dependencies.timelineSettings,
                     roomId = roomId,
                     timelineId = timelineId,
                     eventDecryptor = dependencies.eventDecryptor,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt

@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
@@ -46,6 +47,7 @@ private const val PAGINATION_COUNT = 50
  * It also triggers pagination to the server when needed, or dispatch to the prev or next chunk if any.
  */
 internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
+                                         private val timelineSettings: TimelineSettings,
                                          private val roomId: String,
                                          private val timelineId: String,
                                          private val eventDecryptor: TimelineEventDecryptor,
@@ -59,6 +61,9 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
     private val isLastForward = AtomicBoolean(chunkEntity.isLastForward)
 
     private val chunkObjectListener = RealmObjectChangeListener<ChunkEntity> { _, changeSet ->
+        if(changeSet?.isDeleted.orFalse()){
+            return@RealmObjectChangeListener
+        }
         Timber.v("on chunk (${chunkEntity.identifier()}) changed: ${changeSet?.changedFields?.joinToString(",")}")
         if(changeSet?.isFieldChanged(ChunkEntityFields.IS_LAST_FORWARD).orFalse()){
             isLastForward.set(chunkEntity.isLastForward)
@@ -252,7 +257,8 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
     }
 
     private fun buildTimelineEvent(eventEntity: TimelineEventEntity) = timelineEventMapper.map(
-            timelineEventEntity = eventEntity
+            timelineEventEntity = eventEntity,
+            buildReadReceipts = timelineSettings.buildReadReceipts
     ).let {
         // eventually enhance with ui echo?
         (uiEchoManager?.decorateEventWithReactionUiEcho(it) ?: it)
@@ -261,6 +267,7 @@ internal class TimelineChunk constructor(private val chunkEntity: ChunkEntity,
     private fun createTimelineChunk(chunkEntity: ChunkEntity): TimelineChunk {
         return TimelineChunk(
                 chunkEntity = chunkEntity,
+                timelineSettings = timelineSettings,
                 timelineId = timelineId,
                 eventDecryptor = eventDecryptor,
                 roomId = roomId,