From 816301bf8dad7b9acb163cb27d5e56225625be66 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Nov 2020 15:09:49 +0100 Subject: [PATCH] More cleanup --- .../media/VectorAttachmentViewerActivity.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt index 92b0e0c14c..30af1fdd09 100644 --- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt @@ -119,33 +119,29 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen val inMemoryData = intent.getParcelableArrayListExtra(EXTRA_IN_MEMORY_DATA) if (inMemoryData != null) { val sourceProvider = dataSourceFactory.createProvider(inMemoryData, room) - val index = inMemoryData.indexOfFirst { it.eventId == args.eventId } - initialIndex = index + initialIndex = inMemoryData.indexOfFirst { it.eventId == args.eventId } sourceProvider.interactionListener = this setSourceProvider(sourceProvider) this.currentSourceProvider = sourceProvider if (savedInstanceState == null) { - pager2.setCurrentItem(index, false) + pager2.setCurrentItem(initialIndex, false) // The page change listener is not notified of the change... pager2.post { - onSelectedPositionChanged(index) + onSelectedPositionChanged(initialIndex) } } } else { - val events = room?.getAttachmentMessages() - ?: emptyList() - val index = events.indexOfFirst { it.eventId == args.eventId } - initialIndex = index - + val events = room?.getAttachmentMessages().orEmpty() + initialIndex = events.indexOfFirst { it.eventId == args.eventId } val sourceProvider = dataSourceFactory.createProvider(events) sourceProvider.interactionListener = this setSourceProvider(sourceProvider) this.currentSourceProvider = sourceProvider if (savedInstanceState == null) { - pager2.setCurrentItem(index, false) + pager2.setCurrentItem(initialIndex, false) // The page change listener is not notified of the change... pager2.post { - onSelectedPositionChanged(index) + onSelectedPositionChanged(initialIndex) } } }