Add check for NPE in SoftButtonReplaceOperation

Julian Kast · RHenigan · commit 5d28384c8e75 · 2021-12-06T10:22:11.000-05:00
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java
@@ -304,7 +304,7 @@ private boolean allCurrentStateImagesAreUploaded() {
     }
 
     private boolean supportsSoftButtonImages() {
-        return softButtonCapabilities.getImageSupported();
+        return softButtonCapabilities != null ? Boolean.TRUE.equals(softButtonCapabilities.getImageSupported()) : false;
     }
 
     void setCurrentMainField1(String currentMainField1) {

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ private boolean allCurrentStateImagesAreUploaded() {`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`private boolean supportsSoftButtonImages() {`
`307`		`- return softButtonCapabilities.getImageSupported();`
	`307`	`+ return softButtonCapabilities != null ? Boolean.TRUE.equals(softButtonCapabilities.getImageSupported()) : false;`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`void setCurrentMainField1(String currentMainField1) {`