Skip to content

Commit da79fc0

Browse files
HeniganHenigan
authored andcommitted
Change artwork upload to sets to avoid duplicates
1 parent 7c8c43e commit da79fc0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void setUpEmptyWindowCapability() {
169169

170170
@Test
171171
public void testArtworksToUpload() {
172-
List<SdlArtwork> artworksToUpload = preloadChoicesOperation.artworksToUpload();
172+
HashSet<SdlArtwork> artworksToUpload = preloadChoicesOperation.artworksToUpload();
173173
assertNotNull(artworksToUpload);
174174
assertEquals(artworksToUpload.size(), 1);
175175
}

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public void onComplete(boolean success) {
255255
private void preloadCellArtworks(@NonNull final CompletionListener listener) {
256256
this.currentState = SDLPreloadPresentChoicesOperationState.UPLOADING_IMAGES;
257257

258-
List<SdlArtwork> artworksToUpload = artworksToUpload();
258+
List<SdlArtwork> artworksToUpload = new ArrayList<>(artworksToUpload());
259259

260260
if (artworksToUpload.size() == 0) {
261261
DebugTool.logInfo(TAG, "Choice Preload: No Choice Artworks to upload");
@@ -850,8 +850,8 @@ public void setLoadedCells(HashSet<ChoiceCell> loadedCells) {
850850
this.loadedCells = loadedCells;
851851
}
852852

853-
List<SdlArtwork> artworksToUpload() {
854-
List<SdlArtwork> artworksToUpload = new ArrayList<>();
853+
HashSet<SdlArtwork> artworksToUpload() {
854+
HashSet<SdlArtwork> artworksToUpload = new HashSet<>();
855855
for (ChoiceCell cell : cellsToUpload) {
856856
if (shouldSendChoicePrimaryImage() && fileManager.get() != null && fileManager.get().fileNeedsUpload(cell.getArtwork())) {
857857
artworksToUpload.add(cell.getArtwork());

0 commit comments

Comments
 (0)