rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
Benoit Marty 2020-11-10 14:46:19 +01:00
parent dc17e5c3fa
commit bcd384c31c
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
View File

@ -30,7 +30,10 @@ import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.session.file.FileService import org.matrix.android.sdk.api.session.file.FileService
import java.io.File import java.io.File
abstract class BaseAttachmentProvider(val imageContentRenderer: ImageContentRenderer, val fileService: FileService) : AttachmentSourceProvider { abstract class BaseAttachmentProvider(
private val imageContentRenderer: ImageContentRenderer,
protected val fileService: FileService
) : AttachmentSourceProvider {
interface InteractionListener { interface InteractionListener {
fun onDismissTapped() fun onDismissTapped()

1
vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
View File

@ -31,7 +31,6 @@ import java.io.File
class DataAttachmentRoomProvider( class DataAttachmentRoomProvider(
private val attachments: List<AttachmentData>, private val attachments: List<AttachmentData>,
private val room: Room?, private val room: Room?,
private val initialIndex: Int,
imageContentRenderer: ImageContentRenderer, imageContentRenderer: ImageContentRenderer,
private val dateFormatter: VectorDateFormatter, private val dateFormatter: VectorDateFormatter,
fileService: FileService) : BaseAttachmentProvider(imageContentRenderer, fileService) { fileService: FileService) : BaseAttachmentProvider(imageContentRenderer, fileService) {

9
vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
View File

@ -40,7 +40,6 @@ import javax.inject.Inject
class RoomEventsAttachmentProvider( class RoomEventsAttachmentProvider(
private val attachments: List<TimelineEvent>, private val attachments: List<TimelineEvent>,
private val initialIndex: Int,
imageContentRenderer: ImageContentRenderer, imageContentRenderer: ImageContentRenderer,
private val dateFormatter: VectorDateFormatter, private val dateFormatter: VectorDateFormatter,
fileService: FileService fileService: FileService
@ -167,11 +166,11 @@ class AttachmentProviderFactory @Inject constructor(
private val session: Session private val session: Session
) { ) {
fun createProvider(attachments: List<TimelineEvent>, initialIndex: Int): RoomEventsAttachmentProvider { fun createProvider(attachments: List<TimelineEvent>): RoomEventsAttachmentProvider {
return RoomEventsAttachmentProvider(attachments, initialIndex, imageContentRenderer, vectorDateFormatter, session.fileService()) return RoomEventsAttachmentProvider(attachments, imageContentRenderer, vectorDateFormatter, session.fileService())
} }
fun createProvider(attachments: List<AttachmentData>, room: Room?, initialIndex: Int): DataAttachmentRoomProvider { fun createProvider(attachments: List<AttachmentData>, room: Room?): DataAttachmentRoomProvider {
return DataAttachmentRoomProvider(attachments, room, initialIndex, imageContentRenderer, vectorDateFormatter, session.fileService()) return DataAttachmentRoomProvider(attachments, room, imageContentRenderer, vectorDateFormatter, session.fileService())
} }
} }

4
vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
View File

@ -118,7 +118,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
val inMemoryData = intent.getParcelableArrayListExtra<AttachmentData>(EXTRA_IN_MEMORY_DATA) val inMemoryData = intent.getParcelableArrayListExtra<AttachmentData>(EXTRA_IN_MEMORY_DATA)
if (inMemoryData != null) { if (inMemoryData != null) {
val sourceProvider = dataSourceFactory.createProvider(inMemoryData, room, initialIndex) val sourceProvider = dataSourceFactory.createProvider(inMemoryData, room)
val index = inMemoryData.indexOfFirst { it.eventId == args.eventId } val index = inMemoryData.indexOfFirst { it.eventId == args.eventId }
initialIndex = index initialIndex = index
sourceProvider.interactionListener = this sourceProvider.interactionListener = this
@ -137,7 +137,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
val index = events.indexOfFirst { it.eventId == args.eventId } val index = events.indexOfFirst { it.eventId == args.eventId }
initialIndex = index initialIndex = index
val sourceProvider = dataSourceFactory.createProvider(events, index) val sourceProvider = dataSourceFactory.createProvider(events)
sourceProvider.interactionListener = this sourceProvider.interactionListener = this
setSourceProvider(sourceProvider) setSourceProvider(sourceProvider)
this.currentSourceProvider = sourceProvider this.currentSourceProvider = sourceProvider