diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-10-10 17:18:18 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-10-10 17:18:18 -0400 |
| commit | 1732f43bbedda32834454bc0ac00557fa2fded55 (patch) | |
| tree | 52d953620536d8230b867e640557f916850af6dd | |
| parent | 84855cfcb1e10217a91c5f90a951d12ad423466e (diff) | |
| download | sdl_android-feature/choice_set_static_icons.tar.gz | |
Fix issue with choice set manager and static imagesfeature/choice_set_static_icons
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index 506e677ce..70d84b4c7 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -216,10 +216,10 @@ class PreloadChoicesOperation extends AsynchronousOperation { choice.setIgnoreAddingVRItems(true); if (fileManager.get() != null){ - if (image != null && fileManager.get().hasUploadedFile(cell.getArtwork())) { + if (image != null && (cell.getArtwork().isStaticIcon() || fileManager.get().hasUploadedFile(cell.getArtwork()))) { choice.setImage(image); } - if (secondaryImage != null && fileManager.get().hasUploadedFile(cell.getSecondaryArtwork())) { + if (secondaryImage != null && (cell.getSecondaryArtwork().isStaticIcon() || fileManager.get().hasUploadedFile(cell.getSecondaryArtwork()))) { choice.setSecondaryImage(secondaryImage); } } |