Skip to content

Commit a6a73e8

Browse files
Simplify NPE checking code
1 parent 6a714f3 commit a6a73e8

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,9 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
175175
if (currentHMILevel == null || currentHMILevel.equals(HMILevel.HMI_NONE) || currentSystemContext.equals(SystemContext.SYSCTXT_MENU)){
176176
// We are in NONE or the menu is in use, bail out of here
177177
waitingOnHMIUpdate = true;
178-
if (clonedCells == null) {
179-
waitingUpdateMenuCells = new ArrayList<>();
180-
} else {
181-
waitingUpdateMenuCells = new ArrayList<>(clonedCells);
178+
waitingUpdateMenuCells = new ArrayList<>();
179+
if (clonedCells != null) {
180+
waitingUpdateMenuCells.addAll(clonedCells);
182181
}
183182
return;
184183
}
@@ -190,10 +189,9 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
190189
oldMenuCells = new ArrayList<>(menuCells);
191190
}
192191
// copy new list
193-
if (clonedCells == null) {
194-
menuCells = new ArrayList<>();
195-
} else {
196-
menuCells = new ArrayList<>(clonedCells);
192+
menuCells = new ArrayList<>();
193+
if (clonedCells != null) {
194+
menuCells.addAll(clonedCells);
197195
}
198196

199197
// HashSet order doesnt matter / does not allow duplicates

0 commit comments

Comments
 (0)