MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 10:35:50 +01:00
Code Releases Wiki Activity

Pebble: fix protocol encoding bugs of timeline pin, add location

Browse Source
This commit is contained in:
Andreas Shimokawa 2017-04-20 21:40:06 +02:00
parent 8385d8079a
commit bc368a788b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -527,6 +527,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
default: default:
iconId = PebbleIconID.TIMELINE_CALENDAR; iconId = PebbleIconID.TIMELINE_CALENDAR;
attributes.add(new Pair<>(3, (Object) calendarEventSpec.description)); attributes.add(new Pair<>(3, (Object) calendarEventSpec.description));
attributes.add(new Pair<>(11, (Object) calendarEventSpec.location));
} }
return encodeTimelinePin(new UUID(GB_UUID_MASK | calendarEventSpec.type, id), calendarEventSpec.timestamp, (short) (calendarEventSpec.durationInSeconds / 60), iconId, attributes); return encodeTimelinePin(new UUID(GB_UUID_MASK | calendarEventSpec.type, id), calendarEventSpec.timestamp, (short) (calendarEventSpec.durationInSeconds / 60), iconId, attributes);
@ -851,13 +852,14 @@ public class PebbleProtocol extends GBDeviceProtocol {
layout_id = 0x02; layout_id = 0x02;
} }
icon_id |= 0x80000000; icon_id |= 0x80000000;
byte attributes_count = 2; byte attributes_count = 1;
byte actions_count = 0; byte actions_count = 0;
int attributes_length = 10; int attributes_length = 7;
for (Pair<Integer, Object> pair : attributes) { for (Pair<Integer, Object> pair : attributes) {
if (pair.first == null || pair.second == null) if (pair.first == null || pair.second == null)
continue; continue;
attributes_count++;
if (pair.second instanceof Integer) { if (pair.second instanceof Integer) {
attributes_length += 7; attributes_length += 7;
} else if (pair.second instanceof Byte) { } else if (pair.second instanceof Byte) {