From 2a30e9486c55304e41f063d0aad67923b234717e Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Sat, 23 Jun 2018 11:15:03 +0200
Subject: [PATCH] Reduce the amount of lines in the logcat for binary dumps

Concatenate the binary values instead of logging one byte per line.
---
 .../freeyourgadget/gadgetbridge/Logging.java         |  5 ++---
 .../service/devices/miband/MiBandSupport.java        | 12 +++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
index 725533574..8f7b6da20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
@@ -30,6 +30,7 @@ import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.core.encoder.Encoder;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
 import ch.qos.logback.core.util.StatusPrinter;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public abstract class Logging {
     public static final String PROP_LOGFILES_DIR = "GB_LOGFILES_DIR";
@@ -156,9 +157,7 @@ public abstract class Logging {
 
     public static void logBytes(Logger logger, byte[] value) {
         if (value != null) {
-            for (byte b : value) {
-                logger.warn("DATA: " + String.format("0x%2x", b));
-            }
+            logger.warn("DATA: " + GB.hexdump(value, 0, value.length));
         }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
index 8d07ed35b..877debd5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
@@ -1056,9 +1056,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
         if (value.length != 1) {
             LOG.error("Notifications should be 1 byte long.");
             LOG.info("RECEIVED DATA WITH LENGTH: " + value.length);
-            for (byte b : value) {
-                LOG.warn("DATA: " + String.format("0x%2x", b));
-            }
+            LOG.warn("DATA: " + GB.hexdump(value, 0, value.length));
             return;
         }
         switch (value[0]) {
@@ -1087,9 +1085,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
                 LOG.info("Setting latency succeeded.");
                 break;
             default:
-                for (byte b : value) {
-                    LOG.warn("DATA: " + String.format("0x%2x", b));
-                }
+                LOG.warn("DATA: " + GB.hexdump(value, 0, value.length));
         }
     }
 
@@ -1297,9 +1293,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
 
         if ((value.length - 2) % 6 != 0) {
             LOG.warn("GOT UNEXPECTED SENSOR DATA WITH LENGTH: " + value.length);
-            for (byte b : value) {
-                LOG.warn("DATA: " + String.format("0x%4x", b));
-            }
+            LOG.warn("DATA: " + GB.hexdump(value, 0, value.length));
         }
         else {
             counter = (value[0] & 0xff) | ((value[1] & 0xff) << 8);