From 609a673daeaa20931982183bbd490227d1e8cf31 Mon Sep 17 00:00:00 2001 From: Me7c7 Date: Sun, 1 Dec 2024 17:57:27 +0200 Subject: [PATCH] Huawei: Little cleanups in P2P service --- .../service/devices/huawei/p2p/HuaweiP2PCalendarService.java | 3 +-- .../devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java | 2 -- .../service/devices/huawei/p2p/HuaweiP2PTrackService.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PCalendarService.java index d10c1f09b..7a15142eb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PCalendarService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PCalendarService.java @@ -302,7 +302,7 @@ public class HuaweiP2PCalendarService extends HuaweiBaseP2PService { byte[] dataBytes = data.getBytes(StandardCharsets.UTF_8); ByteBuffer sendData = ByteBuffer.allocate(dataBytes.length + 8); // 8 is data header - // NOTE: minor version is short in response but in this case it writes as integer + //NOTE: minor version is short in response but in this case it writes as integer sendData.putInt(minorVersion); sendData.putInt(dataBytes.length); sendData.put(dataBytes); @@ -487,6 +487,5 @@ public class HuaweiP2PCalendarService extends HuaweiBaseP2PService { } catch (HuaweiPacket.MissingTagException e) { LOG.error("P2P handle packet: tag is missing"); } - } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java index 59d13e2b0..49e276a6a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java @@ -274,8 +274,6 @@ public class HuaweiP2PDataDictionarySyncService extends HuaweiBaseP2PService { for (HuaweiTLV l1 : l.getObjects(0x87)) { for (HuaweiTLV ll : l1.getObjects(0x88)) { int type = ll.getInteger(0x9); - // 10 - Double - data - // 11 - String - metadata if (ll.contains(0xa)) dataValues.add(new DictData.DictDataValue(type, (byte) 0xa, ll.getBytes(0xa))); if (ll.contains(0xb)) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PTrackService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PTrackService.java index e8bc0bf80..da92fecac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PTrackService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PTrackService.java @@ -75,7 +75,7 @@ public class HuaweiP2PTrackService extends HuaweiBaseP2PService { header.putInt(counter.getNext()); // message id header.flip(); - ByteBuffer packet = ByteBuffer.allocate(36 + data.length); + ByteBuffer packet = ByteBuffer.allocate(HEADER_LENGTH + data.length); packet.put(header.array()); packet.put(data); packet.flip();