From 44d8af97e9c5860655f655d253480c7905d1ea96 Mon Sep 17 00:00:00 2001
From: Justin Bassett <bassett.justint@gmail.com>
Date: Fri, 16 Oct 2020 07:37:26 -0400
Subject: [PATCH] Fix fan speed for non int fan speeds. (#1060)

---
 .../homeassistant/companion/android/controls/FanControl.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/homeassistant/companion/android/controls/FanControl.kt b/app/src/main/java/io/homeassistant/companion/android/controls/FanControl.kt
index 78e97b6d8..ba5362493 100644
--- a/app/src/main/java/io/homeassistant/companion/android/controls/FanControl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/controls/FanControl.kt
@@ -28,7 +28,7 @@ class FanControl {
             val speeds = entity.attributes["speed_list"].toString()
                 .removeSurrounding("[", "]")
                 .split(", ")
-            val currentSpeed: Int? = entity.attributes["speed"].toString().toIntOrNull()
+            val currentSpeed = entity.attributes["speed"].toString()
 
             val control = Control.StatefulBuilder(
                 entity.entityId,
@@ -42,7 +42,7 @@ class FanControl {
             control.setTitle(entity.attributes["friendly_name"].toString())
             control.setDeviceType(DeviceTypes.TYPE_FAN)
             control.setStatus(Control.STATUS_OK)
-            if (currentSpeed != null) {
+            if (currentSpeed.isNotBlank()) {
                 control.setControlTemplate(
                     ToggleRangeTemplate(
                         entity.entityId,
@@ -52,7 +52,7 @@ class FanControl {
                             entity.entityId,
                             0f,
                             speeds.size.toFloat() - 1,
-                            speeds.indexOf(currentSpeed.toString()).toFloat(),
+                            speeds.indexOf(currentSpeed).toFloat(),
                             1f,
                             ""
                         )