From 6e14411cc4e2c86e45806203285a5cf6996b4de0 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sun, 26 Feb 2023 16:38:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D1=8F=D1=8E=D1=89=D0=B8?=
 =?UTF-8?q?=D0=B5=D1=81=D1=8F=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D1=85=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=20=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D1=85=20//upd:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DeviceList.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp
index c1e398cb..2040e669 100644
--- a/src/DeviceList.cpp
+++ b/src/DeviceList.cpp
@@ -75,23 +75,23 @@ void asyncUdpInit() {
 void jsonMergeArrays(String& existJson, String& incJson) {
     DynamicJsonDocument incJsonDoc(1024);
     DeserializationError incJsonError = deserializeJson(incJsonDoc, incJson);
-    if (incJsonError) {
-        SerialPrint("E", F("UDP"), "Invailed json in incomming udp packet " + String(incJsonError.f_str()));
-        jsonErrorDetected();
-        return;
-    }
+    // if (incJsonError) {  // upd: devlist заведомо верный, зачем проверять еще раз?
+    //     SerialPrint("E", F("UDP"), "Invailed json in incomming udp packet " + String(incJsonError.f_str()));
+    //     jsonErrorDetected();
+    //     return;
+    // }
 
     DynamicJsonDocument existJsonDoc(1024);
     DeserializationError existJsonError = deserializeJson(existJsonDoc, existJson);
-    if (existJsonError) {
-        SerialPrint("E", F("UDP"), "Invailed json in existing udp dev list " + String(incJsonError.f_str()));
-        jsonErrorDetected();
-        return;
-    }
+    // if (existJsonError) {    // upd: полученный json уже проверен на целостность
+    //     SerialPrint("E", F("UDP"), "Invailed json in existing udp dev list " + String(incJsonError.f_str()));
+    //     jsonErrorDetected();
+    //     return;
+    // }
     JsonArray existJsonArr = existJsonDoc.as<JsonArray>();
 
-    incJson.replace("[", "");
-    incJson.replace("]", "");
+    // incJson.replace("[", "");    // upd: уже исключены символы ранее при получении пакета
+    // incJson.replace("]", "");
     String incIP = jsonReadStr(incJson, "ip");
     String outArr = "[";
     bool ipExistInList = false;