From 507e58922fa9138945b2ef0c2d1fc028798b04ac Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 1 Jan 2017 17:58:34 +0100
Subject: [PATCH] Pebble: fix decoding of byte and short appmessage data (when
 a native handler is present)

---
 .../service/devices/pebble/PebbleProtocol.java            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
index 625cc734..407b79fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
@@ -1733,7 +1733,13 @@ public class PebbleProtocol extends GBDeviceProtocol {
             switch (type) {
                 case TYPE_INT:
                 case TYPE_UINT:
-                    dict.add(new Pair<Integer, Object>(key, buf.getInt()));
+                    if (length == 1) {
+                        dict.add(new Pair<Integer, Object>(key, buf.get()));
+                    } else if (length == 2) {
+                        dict.add(new Pair<Integer, Object>(key, buf.getShort()));
+                    } else {
+                        dict.add(new Pair<Integer, Object>(key, buf.getInt()));
+                    }
                     break;
                 case TYPE_CSTRING:
                 case TYPE_BYTEARRAY: