diff options
| author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2019-10-11 10:01:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 10:01:03 -0400 |
| commit | be84a9a41aead16b28092912899973b8ab752363 (patch) | |
| tree | 52d953620536d8230b867e640557f916850af6dd | |
| parent | ac66a7929e61274efb3faa1c0746a654051c7d41 (diff) | |
| parent | 1732f43bbedda32834454bc0ac00557fa2fded55 (diff) | |
| download | sdl_android-be84a9a41aead16b28092912899973b8ab752363.tar.gz | |
Merge pull request #1195 from smartdevicelink/feature/choice_set_static_icons
Fix issue with static icons and ChoiceSetManager
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java | 6 |
1 files changed, 3 insertions, 3 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 6492d2c09..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); } } @@ -266,7 +266,7 @@ class PreloadChoicesOperation extends AsynchronousOperation { if (defaultMainWindowCapability == null ){ return false; } if (defaultMainWindowCapability.getTextFields() != null){ for (TextField field : defaultMainWindowCapability.getTextFields()){ - if (field.getName().equals(name)){ + if (field != null && field.getName() != null && field.getName().equals(name)){ return true; } } |