From 6d9affaa49639fc8bbddcfb44e432977db77ad3b Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 22 Jul 2020 13:44:56 +0200
Subject: [PATCH] Revert "Fix device incorrectly identified when still
 interviewing. #3947"

This reverts commit 1d3a577fc49e34374c55acc63521ead49092dd65.
---
 lib/extension/configure.js | 4 ++++
 lib/extension/report.js    | 1 +
 lib/zigbee.js              | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/extension/configure.js b/lib/extension/configure.js
index 4166288d..79ebad71 100644
--- a/lib/extension/configure.js
+++ b/lib/extension/configure.js
@@ -28,6 +28,10 @@ class Configure extends Extension {
             return false;
         }
 
+        if (resolvedEntity.device.interviewing === true) {
+            return false;
+        }
+
         return true;
     }
 
diff --git a/lib/extension/report.js b/lib/extension/report.js
index da944e46..4b7014ef 100644
--- a/lib/extension/report.js
+++ b/lib/extension/report.js
@@ -173,6 +173,7 @@ class Report extends Extension {
         // https://github.com/Koenkk/zigbee2mqtt/issues/966
         if (messageType === 'deviceAnnounce' && utils.isIkeaTradfriDevice(device)) return true;
 
+        if (resolvedEntity.device.interviewing === true) return false;
         if (device.meta.hasOwnProperty('reporting') && device.meta.reporting === reportKey) return false;
         if (!utils.isRouter(device) || utils.isBatteryPowered(device)) return false;
         // Gledopto devices don't support reporting.
diff --git a/lib/zigbee.js b/lib/zigbee.js
index 0ac62dfc..e1d81875 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -191,7 +191,7 @@ class Zigbee extends events.EventEmitter {
                     return null;
                 }
 
-                const definition = !device.interviewing ? zigbeeHerdsmanConverters.findByDevice(device) : null;
+                const definition = zigbeeHerdsmanConverters.findByDevice(device);
                 const endpoints = definition && definition.endpoint ? definition.endpoint(device) : null;
                 let endpoint;
                 if (endpointKey) {
@@ -226,7 +226,7 @@ class Zigbee extends events.EventEmitter {
                 endpoint: key.endpoints[0],
                 settings: setting,
                 name: setting ? setting.friendlyName : (key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr),
-                definition: !key.interviewing ? zigbeeHerdsmanConverters.findByDevice(key) : null,
+                definition: zigbeeHerdsmanConverters.findByDevice(key),
             };
         } else { // Group
             const setting = settings.getEntity(key.groupID);