From f57fc827feeaa37753221f0d1167f9dd954f8ff2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 10 Nov 2020 15:36:22 +0100
Subject: [PATCH] Last cleanup

---
 .../im/vector/app/features/media/BaseAttachmentProvider.kt | 4 +++-
 .../app/features/media/DataAttachmentRoomProvider.kt       | 6 +++---
 .../app/features/media/RoomEventsAttachmentProvider.kt     | 7 +++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index 208d5e28f8..e23b905919 100644
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -38,7 +38,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import java.io.File
 
 abstract class BaseAttachmentProvider<Type>(
-        protected val attachments: List<Type>,
+        private val attachments: List<Type>,
         private val imageContentRenderer: ImageContentRenderer,
         protected val fileService: FileService,
         private val dateFormatter: VectorDateFormatter,
@@ -58,6 +58,8 @@ abstract class BaseAttachmentProvider<Type>(
 
     final override fun getItemCount() = attachments.size
 
+    protected fun getItem(position: Int) = attachments[position]
+
     final override fun overlayViewAtPosition(context: Context, position: Int): View? {
         if (position == -1) return null
         if (overlayView == null) {
diff --git a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index 02b9c034e9..18312b4aa0 100644
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -35,7 +35,7 @@ class DataAttachmentRoomProvider(
 ) : BaseAttachmentProvider<AttachmentData>(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
 
     override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
-        return attachments[position].let {
+        return getItem(position).let {
             when (it) {
                 is ImageContentRenderer.Data -> {
                     if (it.mimeType == "image/gif") {
@@ -70,12 +70,12 @@ class DataAttachmentRoomProvider(
     }
 
     override fun getTimelineEventAtPosition(position: Int): TimelineEvent? {
-        val item = attachments[position]
+        val item = getItem(position)
         return room?.getTimeLineEvent(item.eventId)
     }
 
     override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
-        val item = attachments[position]
+        val item = getItem(position)
         fileService.downloadFile(
                 downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE,
                 id = item.eventId,
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index da6cc5d570..1e2761dde0 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -40,7 +40,7 @@ class RoomEventsAttachmentProvider(
 ) : BaseAttachmentProvider<TimelineEvent>(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
 
     override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
-        return attachments[position].let {
+        return getItem(position).let {
             val content = it.root.getClearContent().toModel<MessageContent>() as? MessageWithAttachmentContent
             if (content is MessageImageContent) {
                 val data = ImageContentRenderer.Data(
@@ -115,11 +115,11 @@ class RoomEventsAttachmentProvider(
     }
 
     override fun getTimelineEventAtPosition(position: Int): TimelineEvent? {
-        return attachments[position]
+        return getItem(position)
     }
 
     override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
-        attachments[position].let { timelineEvent ->
+        getItem(position).let { timelineEvent ->
 
             val messageContent = timelineEvent.root.getClearContent().toModel<MessageContent>()
                     as? MessageWithAttachmentContent
@@ -144,4 +144,3 @@ class RoomEventsAttachmentProvider(
         }
     }
 }
-