From 39ba99005ab74c2dbf9e04631b15a1a5504d4764 Mon Sep 17 00:00:00 2001
From: Kevin Fronczak <kfronczak@gmail.com>
Date: Sat, 25 May 2019 11:58:44 -0400
Subject: [PATCH] Fix broken blink motion detection (#24097)

---
 homeassistant/components/blink/__init__.py   | 12 +++++++++---
 homeassistant/components/blink/manifest.json |  2 +-
 requirements_all.txt                         |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index 397ee097cae..74057c7b6bc 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -8,7 +8,7 @@ from homeassistant.helpers import (
 from homeassistant.const import (
     CONF_USERNAME, CONF_PASSWORD, CONF_NAME, CONF_SCAN_INTERVAL,
     CONF_BINARY_SENSORS, CONF_SENSORS, CONF_FILENAME,
-    CONF_MONITORED_CONDITIONS, TEMP_FAHRENHEIT)
+    CONF_MONITORED_CONDITIONS, CONF_MODE, CONF_OFFSET, TEMP_FAHRENHEIT)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ BINARY_SENSORS = {
 
 SENSORS = {
     TYPE_TEMPERATURE: ['Temperature', TEMP_FAHRENHEIT, 'mdi:thermometer'],
-    TYPE_BATTERY: ['Battery', '%', 'mdi:battery-80'],
+    TYPE_BATTERY: ['Battery', '', 'mdi:battery-80'],
     TYPE_WIFI_STRENGTH: ['Wifi Signal', 'dBm', 'mdi:wifi-strength-2'],
 }
 
@@ -75,6 +75,8 @@ CONFIG_SCHEMA = vol.Schema(
             vol.Optional(CONF_BINARY_SENSORS, default={}):
                 BINARY_SENSOR_SCHEMA,
             vol.Optional(CONF_SENSORS, default={}): SENSOR_SCHEMA,
+            vol.Optional(CONF_OFFSET, default=1): int,
+            vol.Optional(CONF_MODE, default=''): cv.string,
         })
     },
     extra=vol.ALLOW_EXTRA)
@@ -87,8 +89,12 @@ def setup(hass, config):
     username = conf[CONF_USERNAME]
     password = conf[CONF_PASSWORD]
     scan_interval = conf[CONF_SCAN_INTERVAL]
+    is_legacy = bool(conf[CONF_MODE] == 'legacy')
+    motion_interval = conf[CONF_OFFSET]
     hass.data[BLINK_DATA] = blinkpy.Blink(username=username,
-                                          password=password)
+                                          password=password,
+                                          motion_interval=motion_interval,
+                                          legacy_subdomain=is_legacy)
     hass.data[BLINK_DATA].refresh_rate = scan_interval.total_seconds()
     hass.data[BLINK_DATA].start()
 
diff --git a/homeassistant/components/blink/manifest.json b/homeassistant/components/blink/manifest.json
index 7be44f95a53..abce8a4a0d1 100644
--- a/homeassistant/components/blink/manifest.json
+++ b/homeassistant/components/blink/manifest.json
@@ -3,7 +3,7 @@
   "name": "Blink",
   "documentation": "https://www.home-assistant.io/components/blink",
   "requirements": [
-    "blinkpy==0.13.1"
+    "blinkpy==0.14.0"
   ],
   "dependencies": [],
   "codeowners": [
diff --git a/requirements_all.txt b/requirements_all.txt
index 3eebc5530a7..5288c6c9001 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -243,7 +243,7 @@ bimmer_connected==0.5.3
 bizkaibus==0.1.1
 
 # homeassistant.components.blink
-blinkpy==0.13.1
+blinkpy==0.14.0
 
 # homeassistant.components.blinksticklight
 blinkstick==1.1.8