From eb7366c7e336999d642c2ff8e7acd4c120c5fa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 3 Jun 2023 20:25:23 +0100
Subject: [PATCH] Huami 2021: Prevent duplicated payload logging

---
 .../service/devices/huami/Huami2021ChunkedDecoder.java    | 8 +++++++-
 .../service/devices/huami/Huami2021Support.java           | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
index b0bd85697..19ed82cd3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
@@ -106,7 +106,6 @@ public class Huami2021ChunkedDecoder {
                 try {
                     buf = CryptoUtils.decryptAES(buf, messagekey);
                     buf = ArrayUtils.subarray(buf, 0, currentLength);
-                    LOG.debug("decrypted data {}: {}", String.format("0x%04x", currentType), GB.hexdump(buf));
                 } catch (Exception e) {
                     LOG.warn("error decrypting " + e);
                     currentHandle = null;
@@ -114,6 +113,13 @@ public class Huami2021ChunkedDecoder {
                     return;
                 }
             }
+            LOG.debug(
+                    "{} data {}: {}",
+                    encrypted ? "Decrypted" : "Plaintext",
+                    String.format("0x%04x", currentType),
+                    GB.hexdump(buf)
+            );
+
             try {
                 huami2021Handler.handle2021Payload((short) currentType, buf);
             } catch (final Exception e) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java
index e8f044149..e319482db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java
@@ -1195,8 +1195,6 @@ public abstract class Huami2021Support extends HuamiSupport {
             return;
         }
 
-        LOG.debug("Got 2021 payload for {}: {}", String.format("0x%04x", type), GB.hexdump(payload));
-
         if (mServiceMap.containsKey(type)) {
             mServiceMap.get(type).handlePayload(payload);
             return;