Fix timeout for AlertView

Julian Kast · Julian Kast · commit 4fb1f708e5f6 · 2021-03-11T16:10:27.000-05:00
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java b/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java
@@ -53,7 +53,6 @@ public class AlertView implements Cloneable {
 
 
     private AlertView() {
-        this.timeout = defaultTimeout;
     }
 
     public static class Builder {
@@ -166,7 +165,7 @@ public void cancel() {
 
     public Integer getTimeout() {
         if (timeout == null) {
-            timeout = defaultTimeout;
+            timeout = getDefaultTimeout();
         } else if (timeout < TIMEOUT_MIN) {
             return TIMEOUT_MIN;
         } else if (timeout > TIMEOUT_MAX) {
@@ -246,7 +245,7 @@ public int getDefaultTimeout() {
     }
 
     public void setDefaultTimeout(int defaultTimeout) {
-        this.defaultTimeout = defaultTimeout;
+        AlertView.defaultTimeout = defaultTimeout;
     }
 
     public void setTimeout(int timeout) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public class AlertView implements Cloneable {`
`53`	`53`
`54`	`54`
`55`	`55`	`private AlertView() {`
`56`		`- this.timeout = defaultTimeout;`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`public static class Builder {`
`@@ -166,7 +165,7 @@ public void cancel() {`
`166`	`165`
`167`	`166`	`public Integer getTimeout() {`
`168`	`167`	`if (timeout == null) {`
`169`		`- timeout = defaultTimeout;`
	`168`	`+ timeout = getDefaultTimeout();`
`170`	`169`	`} else if (timeout < TIMEOUT_MIN) {`
`171`	`170`	`return TIMEOUT_MIN;`
`172`	`171`	`} else if (timeout > TIMEOUT_MAX) {`
`@@ -246,7 +245,7 @@ public int getDefaultTimeout() {`
`246`	`245`	`}`
`247`	`246`
`248`	`247`	`public void setDefaultTimeout(int defaultTimeout) {`
`249`		`- this.defaultTimeout = defaultTimeout;`
	`248`	`+ AlertView.defaultTimeout = defaultTimeout;`
`250`	`249`	`}`
`251`	`250`
`252`	`251`	`public void setTimeout(int timeout) {`