MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-28 12:56:49 +01:00
Code Releases Wiki Activity

Pebble: set MIN_ACTION_LENGTH = 6, which is correct

Browse Source
This commit is contained in:
Andreas Shimokawa 2018-11-01 16:02:29 +01:00
parent 22de76620d
commit f05cc83848
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,7 +597,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
//TODO: add support for attachedActions //TODO: add support for attachedActions
private byte[] encodeExtensibleNotification(int id, int timestamp, String title, String subtitle, String body, String sourceName, boolean hasHandle, String[] cannedReplies, ArrayList attachedActions) { private byte[] encodeExtensibleNotification(int id, int timestamp, String title, String subtitle, String body, String sourceName, boolean hasHandle, String[] cannedReplies, ArrayList attachedActions) {
final short ACTION_LENGTH_MIN = 10; final short ACTION_LENGTH_MIN = 6;
String[] parts = {title, subtitle, body}; String[] parts = {title, subtitle, body};
@ -934,7 +934,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
boolean hasHandle, NotificationType notificationType, byte backgroundColor, boolean hasHandle, NotificationType notificationType, byte backgroundColor,
String[] cannedReplies, ArrayList<Action> attachedActions) { String[] cannedReplies, ArrayList<Action> attachedActions) {
final short NOTIFICATION_PIN_LENGTH = 46; final short NOTIFICATION_PIN_LENGTH = 46;
final short ACTION_LENGTH_MIN = 10; final short ACTION_LENGTH_MIN = 6;
String[] parts = {title, subtitle, body}; String[] parts = {title, subtitle, body};
@ -959,8 +959,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
actions_count += 3; actions_count += 3;
dismiss_string = "Dismiss"; dismiss_string = "Dismiss";
dismiss_action_id = 0x02; dismiss_action_id = 0x02;
//TODO: ACTION_LENGTH_MIN disagrees with my observation of the needed bytes. I used 6 instead of 10 actions_length += (short) (ACTION_LENGTH_MIN * 3 + dismiss_string.getBytes().length + open_string.getBytes().length + mute_string.getBytes().length);
actions_length += (short) (6 * 3 + dismiss_string.getBytes().length + open_string.getBytes().length + mute_string.getBytes().length);
} else { } else {
actions_count += 1; actions_count += 1;
dismiss_string = "Dismiss all"; dismiss_string = "Dismiss all";
@ -970,7 +969,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
if (attachedActions != null && attachedActions.size() > 0) { if (attachedActions != null && attachedActions.size() > 0) {
for (Action act : attachedActions) { for (Action act : attachedActions) {
actions_count++; actions_count++;
actions_length += (short) (6 + act.title.getBytes().length); actions_length += (short) (ACTION_LENGTH_MIN + act.title.getBytes().length);
} }
} }
@ -1115,7 +1114,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
private byte[] encodeWeatherPin(int timestamp, String title, String subtitle, String body, String location, int iconId) { private byte[] encodeWeatherPin(int timestamp, String title, String subtitle, String body, String location, int iconId) {
final short NOTIFICATION_PIN_LENGTH = 46; final short NOTIFICATION_PIN_LENGTH = 46;
final short ACTION_LENGTH_MIN = 10; final short ACTION_LENGTH_MIN = 6;
String[] parts = {title, subtitle, body, location, "test", "test"}; String[] parts = {title, subtitle, body, location, "test", "test"};