From 95e4048f4e68bfe1d9de115ddbf24e12a5a99bf3 Mon Sep 17 00:00:00 2001
From: Glenn Waters <gwwaters@gmail.com>
Date: Wed, 7 Oct 2020 04:36:49 -0400
Subject: [PATCH] Fix elkm1 changed by (#41378)

---
 .../components/elkm1/alarm_control_panel.py    | 18 ++++++++----------
 homeassistant/components/elkm1/manifest.json   |  2 +-
 requirements_all.txt                           |  2 +-
 requirements_test_all.txt                      |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/elkm1/alarm_control_panel.py b/homeassistant/components/elkm1/alarm_control_panel.py
index 1c299e68803..3bcacde64b9 100644
--- a/homeassistant/components/elkm1/alarm_control_panel.py
+++ b/homeassistant/components/elkm1/alarm_control_panel.py
@@ -155,18 +155,16 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
             self.async_write_ha_state()
 
     def _watch_area(self, area, changeset):
-        if not changeset.get("log_event"):
+        last_log = changeset.get("last_log")
+        if not last_log:
+            return
+        # user_number only set for arm/disarm logs
+        if not last_log.get("user_number"):
             return
         self._changed_by_keypad = None
-        self._changed_by_id = area.log_number
-        self._changed_by = username(self._elk, area.log_number - 1)
-        self._changed_by_time = "%04d-%02d-%02dT%02d:%02d" % (
-            area.log_year,
-            area.log_month,
-            area.log_day,
-            area.log_hour,
-            area.log_minute,
-        )
+        self._changed_by_id = last_log["user_number"]
+        self._changed_by = username(self._elk, self._changed_by_id - 1)
+        self._changed_by_time = last_log["timestamp"]
         self.async_write_ha_state()
 
     @property
diff --git a/homeassistant/components/elkm1/manifest.json b/homeassistant/components/elkm1/manifest.json
index ca694157ba7..dd62c3a4989 100644
--- a/homeassistant/components/elkm1/manifest.json
+++ b/homeassistant/components/elkm1/manifest.json
@@ -2,7 +2,7 @@
   "domain": "elkm1",
   "name": "Elk-M1 Control",
   "documentation": "https://www.home-assistant.io/integrations/elkm1",
-  "requirements": ["elkm1-lib==0.7.19"],
+  "requirements": ["elkm1-lib==0.8.0"],
   "codeowners": ["@gwww", "@bdraco"],
   "config_flow": true
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index a95c27e294c..773b0299084 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -538,7 +538,7 @@ elgato==0.2.0
 eliqonline==1.2.2
 
 # homeassistant.components.elkm1
-elkm1-lib==0.7.19
+elkm1-lib==0.8.0
 
 # homeassistant.components.mobile_app
 emoji==0.5.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 374054d4fe2..94d287249b0 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -278,7 +278,7 @@ eebrightbox==0.0.4
 elgato==0.2.0
 
 # homeassistant.components.elkm1
-elkm1-lib==0.7.19
+elkm1-lib==0.8.0
 
 # homeassistant.components.mobile_app
 emoji==0.5.4