Review and standup feedback fixes

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java

@@ -455,10 +455,31 @@ public void testAssignEmptyStateListToSoftButtonObject() {
     }
 
     /**
-     * Test assigning a nonempty state list to existing SoftButtonObject
+     * Test assigning a state list with the current state to existing SoftButtonObject
      */
     @Test
-    public void testAssignNonEmptyStateListToSoftButtonObject() {
+    public void testAssignStateListWithCurrentStateToSoftButtonObject() {
+        List<SoftButtonState> stateList1 = new ArrayList<>();
+        SoftButtonState softButtonState1 = new SoftButtonState("hello_there", "Hello there", null);
+        stateList1.add(softButtonState1);
+
+        List<SoftButtonState> stateList2 = new ArrayList<>();
+        SoftButtonState softButtonState2 = new SoftButtonState("general_kenobi", "General Kenobi", null);
+        stateList2.add(softButtonState1);
+        stateList2.add(softButtonState2);
+
+        SoftButtonObject softButtonObject = new SoftButtonObject("general_kenobi", stateList1, "hello_there", null);
+
+        softButtonObject.setStates(stateList2);
+
+        assertEquals(stateList2, softButtonObject.getStates());
+    }
+
+    /**
+     * Test assigning a state list without the current state to existing SoftButtonObject
+     */
+    @Test
+    public void testAssignStateListWithoutCurrentStateToSoftButtonObject() {
         List<SoftButtonState> stateList1 = new ArrayList<>();
         SoftButtonState softButtonState1 = new SoftButtonState("hello_there", "Hello there", null);
         stateList1.add(softButtonState1);

base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java

@@ -283,16 +283,20 @@ public void setStates(@NonNull List<SoftButtonState> states) {
             return;
         }
 
+        if (states.isEmpty()) {
+            DebugTool.logError(TAG, "A SoftButtonObject must contain at least one state");
+            return;
+        }
+
         boolean hasStateWithCurrentName = false;
         for (SoftButtonState state : states) {
             if(state.getName().equals(currentStateName)) {
-                hasStateWithCurrentNameName = true;
+                hasStateWithCurrentName = true;
                 break;
             }
         }
         if (!hasStateWithCurrentName) {
-            DebugTool.logError(TAG, "A SoftButtonObject must have a state with currentStateName.");
-            return;
+            DebugTool.logError(TAG, "A SoftButtonObject should have a state with currentStateName.");
         }
 
         this.states = states;