[androidtv] Removes unnecessary null checks (#15331)

* Removes unnecessary null checks
* Moves checks to thing-types.xml
* Fix typo
* Update i18n

Signed-off-by: Ben Rosenblum <rosenblumb@gmail.com>

diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/googletv/GoogleTVConnectionManager.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/googletv/GoogleTVConnectionManager.java
index 47e2a6b8bce17dd7f4eb2c713ff7d9f1f52c680c..39f5b6f4bd344b64a26733266b2b4a0024077d73 100644 (file)
--- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/googletv/GoogleTVConnectionManager.java
+++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/googletv/GoogleTVConnectionManager.java
@@ -462,11 +462,6 @@ public class GoogleTVConnectionManager {
         }
 
         config.port = (config.port > 0) ? config.port : DEFAULT_PORT;
-        config.reconnect = (config.reconnect > 0) ? config.reconnect : DEFAULT_RECONNECT_SECONDS;
-        config.heartbeat = (config.heartbeat > 0) ? config.heartbeat : DEFAULT_HEARTBEAT_SECONDS;
-        config.delay = (config.delay < 0) ? 0 : config.delay;
-        config.shim = (config.shim) ? true : false;
-        config.shimNewKeys = (config.shimNewKeys) ? true : false;
         config.mode = (!config.mode.equals("")) ? config.mode : DEFAULT_MODE;
 
         config.keystoreFileName = (!config.keystoreFileName.equals("")) ? config.keystoreFileName

diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/shieldtv/ShieldTVConnectionManager.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/shieldtv/ShieldTVConnectionManager.java
index c52937c9ac600f4726a9e2c138402c6b399e3fb1..db0ffc754bfd280def4b8642dc180c1bfbbebe7a 100644 (file)
--- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/shieldtv/ShieldTVConnectionManager.java
+++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/shieldtv/ShieldTVConnectionManager.java
@@ -358,11 +358,6 @@ public class ShieldTVConnectionManager {
         }
 
         config.port = (config.port > 0) ? config.port : DEFAULT_PORT;
-        config.reconnect = (config.reconnect > 0) ? config.reconnect : DEFAULT_RECONNECT_SECONDS;
-        config.heartbeat = (config.heartbeat > 0) ? config.heartbeat : DEFAULT_HEARTBEAT_SECONDS;
-        config.delay = (config.delay < 0) ? 0 : config.delay;
-        config.shim = (config.shim) ? true : false;
-        config.shimNewKeys = (config.shimNewKeys) ? true : false;
 
         config.keystoreFileName = (!config.keystoreFileName.equals("")) ? config.keystoreFileName
                 : folderName + "/shieldtv." + ((config.shim) ? "shim." : "") + handler.getThing().getUID().getId()

diff --git a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties
index 91cb9eb79dd905004e63ba442d8e0a53067266da..cb0f4d005a83bf2cd66650b592a895d5430fc841 100644 (file)
--- a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties
+++ b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties
@@ -28,7 +28,7 @@ thing-type.config.androidtv.googletv.reconnect.label = Reconnect Delay
 thing-type.config.androidtv.googletv.reconnect.description = Delay between reconnection attempts
 thing-type.config.androidtv.shieldtv.delay.label = Delay
 thing-type.config.androidtv.shieldtv.delay.description = Delay between messages
-thing-type.config.androidtv.shieldtv.heartbeat.label = Hearbeat Frequency
+thing-type.config.androidtv.shieldtv.heartbeat.label = Heartbeat Frequency
 thing-type.config.androidtv.shieldtv.heartbeat.description = Frequency of heartbeats
 thing-type.config.androidtv.shieldtv.ipAddress.label = Hostname
 thing-type.config.androidtv.shieldtv.ipAddress.description = Hostname or IP address of the device

diff --git a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
index 9101a2504e692bc3147f1d49debe325ff3209bbe..7cd1853be8ca4e76a00609095269d0a94955651e 100644 (file)
--- a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
@@ -56,17 +56,20 @@
                                <label>Keystore Password</label>
                                <description>Password for the keystore file</description>
                        </parameter>
-                       <parameter name="reconnect" type="integer">
+                       <parameter name="reconnect" type="integer" min="0">
                                <label>Reconnect Delay</label>
                                <description>Delay between reconnection attempts</description>
+                               <default>60</default>
                        </parameter>
-                       <parameter name="heartbeat" type="integer">
-                               <label>Hearbeat Frequency</label>
+                       <parameter name="heartbeat" type="integer" min="0">
+                               <label>Heartbeat Frequency</label>
                                <description>Frequency of heartbeats</description>
+                               <default>5</default>
                        </parameter>
-                       <parameter name="delay" type="integer">
+                       <parameter name="delay" type="integer" min="0">
                                <label>Delay</label>
                                <description>Delay between messages</description>
+                               <default>0</default>
                        </parameter>
                </config-description>
 
@@ -119,17 +122,20 @@
                                <label>Keystore Password</label>
                                <description>Password for the keystore file</description>
                        </parameter>
-                       <parameter name="reconnect" type="integer">
+                       <parameter name="reconnect" type="integer" min="0">
                                <label>Reconnect Delay</label>
                                <description>Delay between reconnection attempts</description>
+                               <default>60</default>
                        </parameter>
-                       <parameter name="heartbeat" type="integer">
+                       <parameter name="heartbeat" type="integer" min="0">
                                <label>Heartbeat Frequency</label>
                                <description>Frequency of heartbeats</description>
+                               <default>5</default>
                        </parameter>
-                       <parameter name="delay" type="integer">
+                       <parameter name="delay" type="integer" min="0">
                                <label>Delay</label>
                                <description>Delay between messages</description>
+                               <default>0</default>
                        </parameter>
                </config-description>