Merge "Remove deduplication from Shareousel" into main

7 files changed, 152 insertions, 57 deletions

diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/CursorPreviewsInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/CursorPreviewsInteractorTest.kt
index c4ba8105..f43f1467 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/CursorPreviewsInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/CursorPreviewsInteractorTest.kt
@@ -34,6 +34,7 @@ import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.p
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.TargetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.targetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.model.CursorRow
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.contentpreview.readSize
 import com.android.intentresolver.contentpreview.uriMetadataReader
@@ -51,10 +52,10 @@ import org.junit.Test
 class CursorPreviewsInteractorTest {
 
     private fun runTestWithDeps(
-        initialSelection: Iterable<Int> = (1..2),
-        focusedItemIndex: Int = initialSelection.count() / 2,
-        cursor: Iterable<Int> = (0 until 4),
-        cursorStartPosition: Int = cursor.count() / 2,
+        initialSelection: Iterable<Int>,
+        focusedItemIndex: Int,
+        cursor: Iterable<Int>,
+        cursorStartPosition: Int,
         pageSize: Int = 16,
         maxLoadedPages: Int = 3,
         cursorSizes: Map<Int, Size> = emptyMap(),
@@ -81,6 +82,7 @@ class CursorPreviewsInteractorTest {
                 block(
                     TestDeps(
                         initialSelection,
+                        focusedItemIndex,
                         cursor,
                         cursorStartPosition,
                         cursorSizes,
@@ -92,6 +94,7 @@ class CursorPreviewsInteractorTest {
 
     private class TestDeps(
         initialSelectionRange: Iterable<Int>,
+        focusedItemIndex: Int,
         private val cursorRange: Iterable<Int>,
         private val cursorStartPosition: Int,
         private val cursorSizes: Map<Int, Size>,
@@ -117,14 +120,26 @@ class CursorPreviewsInteractorTest {
                     }
                 }
         val initialPreviews: List<PreviewModel> =
-            initialSelectionRange.map { i ->
-                PreviewModel(uri = uri(i), mimeType = "image/bitmap", order = i)
+            initialSelectionRange.mapIndexed { index, i ->
+                PreviewModel(
+                    key =
+                        if (index == focusedItemIndex) {
+                            PreviewKey.final(0)
+                        } else {
+                            PreviewKey.temp(index)
+                        },
+                    uri = uri(i),
+                    mimeType = "image/bitmap",
+                    order = i,
+                )
             }
     }
 
     @Test
     fun initialCursorLoad() =
         runTestWithDeps(
+            initialSelection = (1..2),
+            focusedItemIndex = 1,
             cursor = (0 until 10),
             cursorStartPosition = 2,
             cursorSizes = mapOf(0 to (200 x 100)),
@@ -143,6 +158,7 @@ class CursorPreviewsInteractorTest {
                     .containsExactlyElementsIn(
                         List(6) {
                             PreviewModel(
+                                key = PreviewKey.final((it - 2)),
                                 uri = Uri.fromParts("scheme$it", "ssp$it", "fragment$it"),
                                 mimeType = "image/bitmap",
                                 aspectRatio =
@@ -168,7 +184,9 @@ class CursorPreviewsInteractorTest {
     fun loadMoreLeft_evictRight() =
         runTestWithDeps(
             initialSelection = listOf(24),
+            focusedItemIndex = 0,
             cursor = (0 until 48),
+            cursorStartPosition = 24,
             pageSize = 16,
             maxLoadedPages = 1,
         ) { deps ->
@@ -201,7 +219,9 @@ class CursorPreviewsInteractorTest {
     fun loadMoreRight_evictLeft() =
         runTestWithDeps(
             initialSelection = listOf(24),
+            focusedItemIndex = 0,
             cursor = (0 until 48),
+            cursorStartPosition = 24,
             pageSize = 16,
             maxLoadedPages = 1,
         ) { deps ->
@@ -233,7 +253,9 @@ class CursorPreviewsInteractorTest {
     fun noMoreRight_appendUnclaimedFromInitialSelection() =
         runTestWithDeps(
             initialSelection = listOf(24, 50),
+            focusedItemIndex = 0,
             cursor = listOf(24),
+            cursorStartPosition = 0,
             pageSize = 16,
             maxLoadedPages = 2,
         ) { deps ->
@@ -255,7 +277,9 @@ class CursorPreviewsInteractorTest {
     fun noMoreLeft_appendUnclaimedFromInitialSelection() =
         runTestWithDeps(
             initialSelection = listOf(0, 24),
+            focusedItemIndex = 1,
             cursor = listOf(24),
+            cursorStartPosition = 0,
             pageSize = 16,
             maxLoadedPages = 2,
         ) { deps ->
@@ -283,6 +307,7 @@ class CursorPreviewsInteractorTest {
         ) { deps ->
             previewSelectionsRepository.selections.value =
                 PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = uri(1),
                         mimeType = "image/png",
                         order = 0,
@@ -296,6 +321,7 @@ class CursorPreviewsInteractorTest {
             assertThat(previewSelectionsRepository.selections.value.values)
                 .containsExactly(
                     PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = uri(1),
                         mimeType = "image/bitmap",
                         order = 1,
@@ -307,6 +333,7 @@ class CursorPreviewsInteractorTest {
     fun testReadFailedPages() =
         runTestWithDeps(
             initialSelection = listOf(4),
+            focusedItemIndex = 0,
             cursor = emptyList(),
             cursorStartPosition = 0,
             pageSize = 2,
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/FetchPreviewsInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/FetchPreviewsInteractorTest.kt
index 27c98dc0..09d254f3 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/FetchPreviewsInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/FetchPreviewsInteractorTest.kt
@@ -30,6 +30,7 @@ import com.android.intentresolver.contentpreview.payloadtoggle.domain.cursor.pay
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.TargetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.targetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.model.CursorRow
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewsModel
 import com.android.intentresolver.contentpreview.uriMetadataReader
@@ -50,10 +51,10 @@ import org.junit.Test
 class FetchPreviewsInteractorTest {
 
     private fun runTest(
-        initialSelection: Iterable<Int> = (1..2),
-        focusedItemIndex: Int = initialSelection.count() / 2,
-        cursor: Iterable<Int> = (0 until 4),
-        cursorStartPosition: Int = cursor.count() / 2,
+        initialSelection: Iterable<Int>,
+        focusedItemIndex: Int,
+        cursor: Iterable<Int>,
+        cursorStartPosition: Int,
         pageSize: Int = 16,
         maxLoadedPages: Int = 8,
         previewSizes: Map<Int, Size> = emptyMap(),
@@ -110,7 +111,11 @@ class FetchPreviewsInteractorTest {
     fun setsInitialPreviews() =
         runTest(
             initialSelection = (1..3),
-            previewSizes = mapOf(1 to Size(100, 50))) {
+            focusedItemIndex = 1,
+            cursor = (0 until 4),
+            cursorStartPosition = 1,
+            previewSizes = mapOf(1 to Size(100, 50)),
+        ) {
             backgroundScope.launch { fetchPreviewsInteractor.activate() }
             runCurrent()
 
@@ -120,17 +125,20 @@ class FetchPreviewsInteractorTest {
                         previewModels =
                             listOf(
                                 PreviewModel(
+                                    key = PreviewKey.temp(0),
                                     uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                                     mimeType = "image/bitmap",
                                     aspectRatio = 2f,
                                     order = Int.MIN_VALUE,
                                 ),
                                 PreviewModel(
+                                    key = PreviewKey.final(0),
                                     uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                                     mimeType = "image/bitmap",
                                     order = 0,
                                 ),
                                 PreviewModel(
+                                    key = PreviewKey.temp(2),
                                     uri = Uri.fromParts("scheme3", "ssp3", "fragment3"),
                                     mimeType = "image/bitmap",
                                     order = Int.MAX_VALUE,
@@ -146,48 +154,60 @@ class FetchPreviewsInteractorTest {
         }
 
     @Test
-    fun lookupCursorFromContentResolver() = runTest {
-        backgroundScope.launch { fetchPreviewsInteractor.activate() }
-        fakeCursorResolver.complete()
-        runCurrent()
+    fun lookupCursorFromContentResolver() =
+        runTest(
+            initialSelection = (1..2),
+            focusedItemIndex = 1,
+            cursor = (0 until 4),
+            cursorStartPosition = 2,
+        ) {
+            backgroundScope.launch { fetchPreviewsInteractor.activate() }
+            fakeCursorResolver.complete()
+            runCurrent()
 
-        with(cursorPreviewsRepository) {
-            assertThat(previewsModel.value).isNotNull()
-            assertThat(previewsModel.value!!.startIdx).isEqualTo(0)
-            assertThat(previewsModel.value!!.loadMoreLeft).isNull()
-            assertThat(previewsModel.value!!.loadMoreRight).isNull()
-            assertThat(previewsModel.value!!.previewModels)
-                .containsExactly(
-                    PreviewModel(
-                        uri = Uri.fromParts("scheme0", "ssp0", "fragment0"),
-                        mimeType = "image/bitmap",
-                        order = 0,
-                    ),
-                    PreviewModel(
-                        uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
-                        mimeType = "image/bitmap",
-                        order = 1,
-                    ),
-                    PreviewModel(
-                        uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
-                        mimeType = "image/bitmap",
-                        order = 2,
-                    ),
-                    PreviewModel(
-                        uri = Uri.fromParts("scheme3", "ssp3", "fragment3"),
-                        mimeType = "image/bitmap",
-                        order = 3,
-                    ),
-                )
-                .inOrder()
+            with(cursorPreviewsRepository) {
+                assertThat(previewsModel.value).isNotNull()
+                assertThat(previewsModel.value!!.startIdx).isEqualTo(0)
+                assertThat(previewsModel.value!!.loadMoreLeft).isNull()
+                assertThat(previewsModel.value!!.loadMoreRight).isNull()
+                assertThat(previewsModel.value!!.previewModels)
+                    .containsExactly(
+                        PreviewModel(
+                            key = PreviewKey.final(-2),
+                            uri = Uri.fromParts("scheme0", "ssp0", "fragment0"),
+                            mimeType = "image/bitmap",
+                            order = 0,
+                        ),
+                        PreviewModel(
+                            key = PreviewKey.final(-1),
+                            uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
+                            mimeType = "image/bitmap",
+                            order = 1,
+                        ),
+                        PreviewModel(
+                            key = PreviewKey.final(0),
+                            uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
+                            mimeType = "image/bitmap",
+                            order = 2,
+                        ),
+                        PreviewModel(
+                            key = PreviewKey.final(1),
+                            uri = Uri.fromParts("scheme3", "ssp3", "fragment3"),
+                            mimeType = "image/bitmap",
+                            order = 3,
+                        ),
+                    )
+                    .inOrder()
+            }
         }
-    }
 
     @Test
     fun loadMoreLeft_evictRight() =
         runTest(
             initialSelection = listOf(24),
+            focusedItemIndex = 0,
             cursor = (0 until 48),
+            cursorStartPosition = 24,
             pageSize = 16,
             maxLoadedPages = 1,
         ) {
@@ -223,7 +243,9 @@ class FetchPreviewsInteractorTest {
     fun loadMoreRight_evictLeft() =
         runTest(
             initialSelection = listOf(24),
+            focusedItemIndex = 0,
             cursor = (0 until 48),
+            cursorStartPosition = 24,
             pageSize = 16,
             maxLoadedPages = 1,
         ) {
@@ -254,7 +276,9 @@ class FetchPreviewsInteractorTest {
     fun noMoreRight_appendUnclaimedFromInitialSelection() =
         runTest(
             initialSelection = listOf(24, 50),
+            focusedItemIndex = 0,
             cursor = listOf(24),
+            cursorStartPosition = 0,
             pageSize = 16,
             maxLoadedPages = 2,
         ) {
@@ -275,7 +299,9 @@ class FetchPreviewsInteractorTest {
     fun noMoreLeft_appendUnclaimedFromInitialSelection() =
         runTest(
             initialSelection = listOf(0, 24),
+            focusedItemIndex = 1,
             cursor = listOf(24),
+            cursorStartPosition = 0,
             pageSize = 16,
             maxLoadedPages = 2,
         ) {
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewInteractorTest.kt
index 5d9ddbb6..0268a4d5 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewInteractorTest.kt
@@ -24,6 +24,7 @@ import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.p
 import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.previewSelectionsRepository
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.TargetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.targetIntentModifier
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.data.repository.chooserRequestRepository
 import com.android.intentresolver.logging.FakeEventLog
@@ -44,6 +45,7 @@ class SelectablePreviewInteractorTest {
             SelectablePreviewInteractor(
                 key =
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = null,
                         order = 0,
@@ -63,6 +65,7 @@ class SelectablePreviewInteractorTest {
             SelectablePreviewInteractor(
                 key =
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "image/bitmap",
                         order = 0,
@@ -75,6 +78,7 @@ class SelectablePreviewInteractorTest {
 
         previewSelectionsRepository.selections.value =
             PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = "image/bitmap",
                     order = 0,
@@ -93,6 +97,7 @@ class SelectablePreviewInteractorTest {
             SelectablePreviewInteractor(
                 key =
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "image/bitmap",
                         order = 0,
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewsInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewsInteractorTest.kt
index c50d2d3f..c90a3091 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewsInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectablePreviewsInteractorTest.kt
@@ -23,6 +23,7 @@ import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.c
 import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.previewSelectionsRepository
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.TargetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.targetIntentModifier
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewsModel
 import com.android.intentresolver.util.runKosmosTest
@@ -41,11 +42,13 @@ class SelectablePreviewsInteractorTest {
                 previewModels =
                     listOf(
                         PreviewModel(
+                            key = PreviewKey.final(1),
                             uri = Uri.fromParts("scheme", "ssp", "fragment"),
                             mimeType = "image/bitmap",
                             order = 0,
                         ),
                         PreviewModel(
+                            key = PreviewKey.final(2),
                             uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                             mimeType = "image/bitmap",
                             order = 1,
@@ -59,6 +62,7 @@ class SelectablePreviewsInteractorTest {
             )
         previewSelectionsRepository.selections.value =
             PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = null,
                     order = 0,
@@ -72,11 +76,13 @@ class SelectablePreviewsInteractorTest {
         assertThat(keySet.value!!.previewModels)
             .containsExactly(
                 PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = "image/bitmap",
                     order = 0,
                 ),
                 PreviewModel(
+                    key = PreviewKey.final(2),
                     uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                     mimeType = "image/bitmap",
                     order = 1,
@@ -90,6 +96,7 @@ class SelectablePreviewsInteractorTest {
         val firstModel =
             underTest.preview(
                 PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = null,
                     order = 0,
@@ -100,6 +107,7 @@ class SelectablePreviewsInteractorTest {
         val secondModel =
             underTest.preview(
                 PreviewModel(
+                    key = PreviewKey.final(2),
                     uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                     mimeType = null,
                     order = 1,
@@ -112,6 +120,7 @@ class SelectablePreviewsInteractorTest {
     fun keySet_reflectsRepositoryUpdate() = runKosmosTest {
         previewSelectionsRepository.selections.value =
             PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = null,
                     order = 0,
@@ -124,6 +133,7 @@ class SelectablePreviewsInteractorTest {
         val firstModel =
             underTest.preview(
                 PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = null,
                     order = 0,
@@ -140,11 +150,13 @@ class SelectablePreviewsInteractorTest {
                 previewModels =
                     listOf(
                         PreviewModel(
+                            key = PreviewKey.final(1),
                             uri = Uri.fromParts("scheme", "ssp", "fragment"),
                             mimeType = "image/bitmap",
                             order = 0,
                         ),
                         PreviewModel(
+                            key = PreviewKey.final(2),
                             uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                             mimeType = "image/bitmap",
                             order = 1,
@@ -163,11 +175,13 @@ class SelectablePreviewsInteractorTest {
         assertThat(previews.value!!.previewModels)
             .containsExactly(
                 PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = "image/bitmap",
                     order = 0,
                 ),
                 PreviewModel(
+                    key = PreviewKey.final(2),
                     uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                     mimeType = "image/bitmap",
                     order = 1,
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectionInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectionInteractorTest.kt
index c8242333..c24138b8 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectionInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SelectionInteractorTest.kt
@@ -24,6 +24,7 @@ import android.platform.test.flag.junit.SetFlagsRule
 import com.android.intentresolver.Flags
 import com.android.intentresolver.contentpreview.mimetypeClassifier
 import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.previewSelectionsRepository
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.util.runKosmosTest
 import com.google.common.truth.Truth.assertThat
@@ -39,9 +40,10 @@ class SelectionInteractorTest {
     fun singleSelection_removalPrevented() = runKosmosTest {
         val initialPreview =
             PreviewModel(
+                key = PreviewKey.final(1),
                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                 mimeType = null,
-                order = 0
+                order = 0,
             )
         previewSelectionsRepository.selections.value = mapOf(initialPreview.uri to initialPreview)
 
@@ -66,9 +68,10 @@ class SelectionInteractorTest {
     fun singleSelection_itemRemovedNoPendingIntentUpdates() = runKosmosTest {
         val initialPreview =
             PreviewModel(
+                key = PreviewKey.final(1),
                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                 mimeType = null,
-                order = 0
+                order = 0,
             )
         previewSelectionsRepository.selections.value = mapOf(initialPreview.uri to initialPreview)
 
@@ -92,15 +95,17 @@ class SelectionInteractorTest {
     fun multipleSelections_removalAllowed() = runKosmosTest {
         val first =
             PreviewModel(
+                key = PreviewKey.final(1),
                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                 mimeType = null,
-                order = 0
+                order = 0,
             )
         val second =
             PreviewModel(
+                key = PreviewKey.final(2),
                 uri = Uri.fromParts("scheme2", "ssp2", "fragment2"),
                 mimeType = null,
-                order = 1
+                order = 1,
             )
         previewSelectionsRepository.selections.value = listOf(first, second).associateBy { it.uri }
 
@@ -109,7 +114,7 @@ class SelectionInteractorTest {
                 previewSelectionsRepository,
                 { Intent() },
                 updateTargetIntentInteractor,
-                mimetypeClassifier
+                mimetypeClassifier,
             )
 
         underTest.unselect(first)
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SetCursorPreviewsInteractorTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SetCursorPreviewsInteractorTest.kt
index 748459cb..42f1a1b2 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SetCursorPreviewsInteractorTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/SetCursorPreviewsInteractorTest.kt
@@ -21,6 +21,7 @@ package com.android.intentresolver.contentpreview.payloadtoggle.domain.interacto
 import android.net.Uri
 import com.android.intentresolver.contentpreview.payloadtoggle.data.repository.cursorPreviewsRepository
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.model.LoadDirection
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.util.runKosmosTest
 import com.google.common.truth.Truth.assertThat
@@ -37,6 +38,7 @@ class SetCursorPreviewsInteractorTest {
                 previews =
                     listOf(
                         PreviewModel(
+                            key = PreviewKey.final(1),
                             uri = Uri.fromParts("scheme", "ssp", "fragment"),
                             mimeType = null,
                             order = 0,
@@ -59,9 +61,10 @@ class SetCursorPreviewsInteractorTest {
             assertThat(it.previewModels)
                 .containsExactly(
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = null,
-                        order = 0
+                        order = 0,
                     )
                 )
                 .inOrder()
@@ -76,6 +79,7 @@ class SetCursorPreviewsInteractorTest {
                     previews =
                         listOf(
                             PreviewModel(
+                                key = PreviewKey.final(1),
                                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                                 mimeType = null,
                                 order = 0,
diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModelTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModelTest.kt
index fc7ac751..6dd96040 100644
--- a/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModelTest.kt
+++ b/tests/unit/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModelTest.kt
@@ -42,6 +42,7 @@ import com.android.intentresolver.contentpreview.payloadtoggle.domain.interactor
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.interactor.selectionInteractor
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.model.ValueUpdate
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.ContentType
+import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewKey
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewModel
 import com.android.intentresolver.contentpreview.payloadtoggle.shared.model.PreviewsModel
 import com.android.intentresolver.data.model.ChooserRequest
@@ -84,15 +85,17 @@ class ShareouselViewModelTest {
         previewSelectionsRepository.selections.value =
             listOf(
                     PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "image/png",
                         order = 0,
                     ),
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                         mimeType = "image/jpeg",
                         order = 1,
-                    )
+                    ),
                 )
                 .associateBy { it.uri }
         runCurrent()
@@ -104,15 +107,17 @@ class ShareouselViewModelTest {
         previewSelectionsRepository.selections.value =
             listOf(
                     PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "video/mpeg",
                         order = 0,
                     ),
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                         mimeType = "video/mpeg",
                         order = 1,
-                    )
+                    ),
                 )
                 .associateBy { it.uri }
         runCurrent()
@@ -124,15 +129,17 @@ class ShareouselViewModelTest {
         previewSelectionsRepository.selections.value =
             listOf(
                     PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "image/jpeg",
                         order = 0,
                     ),
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                         mimeType = "video/mpeg",
                         order = 1,
-                    )
+                    ),
                 )
                 .associateBy { it.uri }
         runCurrent()
@@ -145,7 +152,7 @@ class ShareouselViewModelTest {
             ChooserRequest(
                 targetIntent = Intent(),
                 launchedFromPackage = "",
-                metadataText = "Hello"
+                metadataText = "Hello",
             )
         chooserRequestRepository.chooserRequest.value = request
 
@@ -162,15 +169,17 @@ class ShareouselViewModelTest {
                     previewModels =
                         listOf(
                             PreviewModel(
+                                key = PreviewKey.final(0),
                                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                                 mimeType = "image/png",
                                 order = 0,
                             ),
                             PreviewModel(
+                                key = PreviewKey.final(1),
                                 uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                                 mimeType = "video/mpeg",
                                 order = 1,
-                            )
+                            ),
                         ),
                     startIdx = 1,
                     loadMoreLeft = null,
@@ -194,6 +203,7 @@ class ShareouselViewModelTest {
             val previewVm =
                 shareouselViewModel.preview.invoke(
                     PreviewModel(
+                        key = PreviewKey.final(1),
                         uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                         mimeType = "video/mpeg",
                         order = 0,
@@ -225,15 +235,17 @@ class ShareouselViewModelTest {
                     previewModels =
                         listOf(
                             PreviewModel(
+                                key = PreviewKey.final(0),
                                 uri = Uri.fromParts("scheme", "ssp", "fragment"),
                                 mimeType = "image/png",
                                 order = 0,
                             ),
                             PreviewModel(
+                                key = PreviewKey.final(1),
                                 uri = Uri.fromParts("scheme1", "ssp1", "fragment1"),
                                 mimeType = "video/mpeg",
                                 order = 1,
-                            )
+                            ),
                         ),
                     startIdx = 1,
                     loadMoreLeft = null,
@@ -246,6 +258,7 @@ class ShareouselViewModelTest {
             val previewVm =
                 shareouselViewModel.preview.invoke(
                     PreviewModel(
+                        key = PreviewKey.final(0),
                         uri = Uri.fromParts("scheme", "ssp", "fragment"),
                         mimeType = "video/mpeg",
                         order = 1,
@@ -314,6 +327,7 @@ class ShareouselViewModelTest {
         this.targetIntentModifier = targetIntentModifier
         previewSelectionsRepository.selections.value =
             PreviewModel(
+                    key = PreviewKey.final(1),
                     uri = Uri.fromParts("scheme", "ssp", "fragment"),
                     mimeType = null,
                     order = 0,