From ce5ccd4dab5a18364526fcf7559b84f6473c0cb1 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 3 Nov 2021 11:44:20 +0100 Subject: [PATCH] Timeline: remove useless methods --- .../sdk/api/session/room/timeline/Timeline.kt | 20 ------------------- .../session/room/timeline/DefaultTimeline.kt | 19 +----------------- .../detail/timeline/merged/MergedTimelines.kt | 18 ----------------- 3 files changed, 1 insertion(+), 56 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt index ae202da979..3ba2aadd38 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt @@ -70,31 +70,11 @@ interface Timeline { */ fun paginate(direction: Direction, count: Int) - /** - * Returns the number of sending events - */ - fun pendingEventCount(): Int - - /** - * Returns the number of failed sending events. - */ - fun failedToDeliverEventCount(): Int - /** * Returns the index of a built event or null. */ fun getIndexOfEvent(eventId: String?): Int? - /** - * Returns the built [TimelineEvent] at index or null - */ - fun getTimelineEventAtIndex(index: Int): TimelineEvent? - - /** - * Returns the built [TimelineEvent] with eventId or null - */ - fun getTimelineEventWithId(eventId: String?): TimelineEvent? - fun getPaginationState(direction: Direction): PaginationState interface Listener { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt index b4e839ae21..857075ffde 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt @@ -54,7 +54,7 @@ internal class DefaultTimeline internal constructor(private val roomId: String, eventDecryptor: TimelineEventDecryptor) : Timeline { companion object { - val BACKGROUND_HANDLER = createBackgroundHandler("SimpleTimeline_Thread") + val BACKGROUND_HANDLER = createBackgroundHandler("DefaultTimeline_Thread") } override val timelineID = UUID.randomUUID().toString() @@ -144,28 +144,11 @@ internal class DefaultTimeline internal constructor(private val roomId: String, } } - override fun pendingEventCount(): Int { - return 0 - } - - override fun failedToDeliverEventCount(): Int { - return 0 - } - override fun getIndexOfEvent(eventId: String?): Int? { if (eventId == null) return null return strategy.getBuiltEventIndex(eventId) } - override fun getTimelineEventAtIndex(index: Int): TimelineEvent? { - return null - } - - override fun getTimelineEventWithId(eventId: String?): TimelineEvent? { - if (eventId == null) return null - return strategy.getBuiltEvent(eventId) - } - override fun getPaginationState(direction: Timeline.Direction): Timeline.PaginationState { return if (direction == Timeline.Direction.BACKWARDS) { backwardState diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt index 0d5dbc5a8e..535b733dc2 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt @@ -133,28 +133,10 @@ class MergedTimelines( secondaryTimeline.paginate(direction, count) } - override fun pendingEventCount(): Int { - return mainTimeline.pendingEventCount() + secondaryTimeline.pendingEventCount() - } - - override fun failedToDeliverEventCount(): Int { - return mainTimeline.pendingEventCount() + secondaryTimeline.pendingEventCount() - } - - override fun getTimelineEventAtIndex(index: Int): TimelineEvent? { - return mergedEvents.getOrNull(index) - } - override fun getIndexOfEvent(eventId: String?): Int? { return positionsMapping[eventId] } - override fun getTimelineEventWithId(eventId: String?): TimelineEvent? { - return positionsMapping[eventId]?.let { - getTimelineEventAtIndex(it) - } - } - private fun processTimelineUpdates(isInit: KMutableProperty0, eventsRef: MutableList, newData: List) { coroutineScope.launch(Dispatchers.Default) { processingSemaphore.withPermit {