From 2aafad46eb5517b9da6ec1dfd650ac8619409561 Mon Sep 17 00:00:00 2001 From: Me7c7 Date: Thu, 29 Aug 2024 23:52:05 +0300 Subject: [PATCH] Huawei: Check TLVs before access. Not present in some watches --- .../gadgetbridge/devices/huawei/packets/App.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/App.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/App.java index 8e89327b3..1295eaccb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/App.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/App.java @@ -129,8 +129,10 @@ public class App { this.params.screenShape = subTlv.getString(0x06); this.params.width = subTlv.getShort(0x07); this.params.height = subTlv.getShort(0x08); - this.params.unknown3 = subTlv.getInteger(0x09); - this.params.buildType = subTlv.getString(0x0a); + if (subTlv.contains(0x09)) + this.params.unknown3 = subTlv.getInteger(0x09); + if(subTlv.contains(0x0a)) + this.params.buildType = subTlv.getString(0x0a); } } }