Merge pull request #1648 from smartdevicelink/bugfix/issue_1647

Robert Henigan · web-flow · commit e1f9c020b19a · 2021-04-20T15:21:34.000-04:00
Add NPE check in BaseChoiceSetManager
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -348,14 +348,14 @@ private void sendPresentOperation(KeyboardListener keyboardListener, Interaction
         ChoiceSetSelectionListener privateChoiceListener = new ChoiceSetSelectionListener() {
             @Override
             public void onChoiceSelected(ChoiceCell choiceCell, TriggerSource triggerSource, int rowIndex) {
-                if (pendingPresentationSet.getChoiceSetSelectionListener() != null) {
+                if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) {
                     pendingPresentationSet.getChoiceSetSelectionListener().onChoiceSelected(choiceCell, triggerSource, rowIndex);
                 }
             }
 
             @Override
             public void onError(String error) {
-                if (pendingPresentationSet.getChoiceSetSelectionListener() != null) {
+                if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) {
                     pendingPresentationSet.getChoiceSetSelectionListener().onError(error);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -348,14 +348,14 @@ private void sendPresentOperation(KeyboardListener keyboardListener, Interaction`
`348`	`348`	`ChoiceSetSelectionListener privateChoiceListener = new ChoiceSetSelectionListener() {`
`349`	`349`	`@Override`
`350`	`350`	`public void onChoiceSelected(ChoiceCell choiceCell, TriggerSource triggerSource, int rowIndex) {`
`351`		`- if (pendingPresentationSet.getChoiceSetSelectionListener() != null) {`
	`351`	`+ if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) {`
`352`	`352`	`pendingPresentationSet.getChoiceSetSelectionListener().onChoiceSelected(choiceCell, triggerSource, rowIndex);`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`@Override`
`357`	`357`	`public void onError(String error) {`
`358`		`- if (pendingPresentationSet.getChoiceSetSelectionListener() != null) {`
	`358`	`+ if (pendingPresentationSet != null && pendingPresentationSet.getChoiceSetSelectionListener() != null) {`
`359`	`359`	`pendingPresentationSet.getChoiceSetSelectionListener().onError(error);`
`360`	`360`	`}`
`361`	`361`	`}`