Align with IOS and JS on timeout logic

Author: Julian Kast

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

@@ -39,10 +39,11 @@
 import java.util.List;
 
 public class AlertView implements Cloneable {
-    
-    private static Integer defaultTimeout = 5;
+
+    private static final int TIMEOUT_DEFAULT = 0;
     private static final int TIMEOUT_MIN = 3;
     private static final int TIMEOUT_MAX = 10;
+    private static Integer defaultTimeout = 5;
     private String text, secondaryText, tertiaryText;
     private Integer timeout;
     private AlertAudioData audio;
@@ -61,14 +62,17 @@ public static class Builder {
 
         public Builder() {
             alertView = new AlertView();
+            if (alertView.timeout == null) {
+                alertView.timeout = TIMEOUT_DEFAULT;
+            }
         }
 
         /**
          * The primary line of text for display on the alert. If fewer than three alert lines are available
          * on the head unit, the screen manager will automatically concatenate some of the lines together.
          */
         public Builder setText(String text) {
-            this.alertView.text = text;
+            alertView.text = text;
             return this;
         }
 
@@ -164,7 +168,7 @@ public void cancel() {
     }
 
     public Integer getTimeout() {
-        if (timeout == null) {
+        if (timeout == TIMEOUT_DEFAULT) {
             timeout = getDefaultTimeout();
         } else if (timeout < TIMEOUT_MIN) {
             return TIMEOUT_MIN;

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java

@@ -59,9 +59,10 @@ public class ChoiceSet {
     ChoiceSetCanceledListener canceledListener;
 
     // defaults
-    private static Integer defaultTimeout = 10;
+    private static final int TIMEOUT_DEFAULT = 0;
     private static final int TIMEOUT_MIN = 5;
     private static final int TIMEOUT_MAX = 100;
+    private static Integer defaultTimeout = 10;
     private final ChoiceSetLayout defaultLayout = ChoiceSetLayout.CHOICE_SET_LAYOUT_LIST;
 
     /**
@@ -81,6 +82,7 @@ public ChoiceSet(@NonNull String title, @NonNull List<ChoiceCell> choices, @NonN
         setTitle(title);
         setChoiceSetSelectionListener(listener);
         setChoices(choices);
+        setTimeout(TIMEOUT_DEFAULT);
 
         // defaults
         setLayout(defaultLayout);
@@ -302,7 +304,7 @@ public void setLayout(ChoiceSetLayout layout) {
      * @return The Timeout
      */
     public Integer getTimeout() {
-        if (timeout == null) {
+        if (timeout == TIMEOUT_DEFAULT) {
             timeout = getDefaultTimeout();
         } else if (timeout < TIMEOUT_MIN) {
             return TIMEOUT_MIN;