demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Garmin: Handle app attribute requests

Browse Source
This commit is contained in:
José Rebelo
2025-11-22 16:53:38 +00:00
parent f8e5590748
commit 9a3f7f426a
2 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/NotificationsHandler.java
+58 -7
View File
@@ -21,6 +21,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Queue;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
@@ -33,6 +34,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.Noti
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.NotificationUpdateMessage;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.status.NotificationDataStatusMessage;
import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue;
import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
public class NotificationsHandler implements MessageHandler {
public static final SimpleDateFormat NOTIFICATION_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.ROOT);
@@ -165,21 +167,24 @@ public class NotificationsHandler implements MessageHandler {
public GFDIMessage handle(GFDIMessage message) {
if (!enabled)
return null;
if (message instanceof NotificationControlMessage) {
final NotificationSpec notificationSpec = getNotificationSpecFromQueue(((NotificationControlMessage) message).getNotificationId());
if (message instanceof NotificationControlMessage notificationControlMessage) {
if (notificationControlMessage.getCommand() == NotificationsHandler.NotificationCommand.GET_APP_ATTRIBUTES) {
return getAppAttributes(notificationControlMessage);
}
final NotificationSpec notificationSpec = getNotificationSpecFromQueue(notificationControlMessage.getNotificationId());
if (notificationSpec != null) {
switch (((NotificationControlMessage) message).getCommand()) {
switch (notificationControlMessage.getCommand()) {
case GET_NOTIFICATION_ATTRIBUTES:
return getNotificationDataMessage((NotificationControlMessage) message, notificationSpec);
return getNotificationDataMessage(notificationControlMessage, notificationSpec);
case PERFORM_LEGACY_NOTIFICATION_ACTION:
LOG.info("Legacy Notification: {}", ((NotificationControlMessage) message).getLegacyNotificationAction());
LOG.info("Legacy Notification: {}", notificationControlMessage.getLegacyNotificationAction());
break;
case PERFORM_NOTIFICATION_ACTION:
performNotificationAction((NotificationControlMessage) message, notificationSpec);
performNotificationAction(notificationControlMessage, notificationSpec);
break;
default:
LOG.error("NOT SUPPORTED: {}", ((NotificationControlMessage) message).getCommand());
LOG.error("NOT SUPPORTED: {}", (notificationControlMessage).getCommand());
}
}
} else if (message instanceof NotificationDataStatusMessage) {
@@ -269,6 +274,31 @@ public class NotificationsHandler implements MessageHandler {
return upload.setCurrentlyUploading(notificationFragment);
}
private NotificationDataMessage getAppAttributes(NotificationControlMessage message) {
final MessageWriter messageWriter = new MessageWriter();
messageWriter.writeByte(NotificationCommand.GET_APP_ATTRIBUTES.code);
messageWriter.writeBytes(message.getAppIdentifier().getBytes(StandardCharsets.UTF_8));
messageWriter.writeByte(0);
for (AppAttribute appAttribute : message.getAppAttributes()) {
messageWriter.writeByte(appAttribute.code);
switch (appAttribute) {
case APP_NAME -> {
final byte[] sourceNameBytes = StringUtils.firstNonBlank(
NotificationUtils.getApplicationLabel(GBApplication.getContext(), message.getAppIdentifier()),
message.getAppIdentifier()
).getBytes(StandardCharsets.UTF_8);
messageWriter.writeShort(sourceNameBytes.length);
messageWriter.writeBytes(sourceNameBytes);
}
default -> {
LOG.error("Unknow app attribute {}", appAttribute);
return null;
}
}
}
NotificationFragment notificationFragment = new NotificationFragment(messageWriter.getBytes());
return upload.setCurrentlyUploading(notificationFragment);
}
public void setEnabled(boolean enable) {
this.enabled = enable;
@@ -300,6 +330,26 @@ public class NotificationsHandler implements MessageHandler {
REFUSE
}
public enum AppAttribute {
APP_NAME(0),
;
public final int code;
AppAttribute(final int code) {
this.code = code;
}
public static AppAttribute getByCode(final int code) {
for (AppAttribute value : AppAttribute.values()) {
if (value.code == code)
return value;
}
return null;
}
}
public enum NotificationAttribute { //was AncsAttribute
APP_IDENTIFIER(0),
TITLE(1, true),
@@ -488,6 +538,7 @@ public class NotificationsHandler implements MessageHandler {
RIGHT, //or is it accept?
LEFT, //or is it dismiss/refuse?
}
public static class Upload {
private NotificationFragment currentlyUploading;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/NotificationControlMessage.java
+39 -1
View File
@@ -10,6 +10,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.NotificationsHandler;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.status.NotificationControlStatusMessage;
import static nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.NotificationsHandler.NotificationCommand.GET_APP_ATTRIBUTES;
import static nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.NotificationsHandler.NotificationCommand.GET_NOTIFICATION_ATTRIBUTES;
import static nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.NotificationsHandler.NotificationCommand.PERFORM_LEGACY_NOTIFICATION_ACTION;
import static nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.NotificationsHandler.NotificationCommand.PERFORM_NOTIFICATION_ACTION;
@@ -19,6 +20,8 @@ public class NotificationControlMessage extends GFDIMessage {
private final NotificationsHandler.NotificationCommand command;
private final int notificationId;
private Map<NotificationsHandler.NotificationAttribute, Integer> notificationAttributesMap;
private String appIdentifier;
private List<NotificationsHandler.AppAttribute> appAttributes;
private NotificationsHandler.LegacyNotificationAction legacyNotificationAction;
private NotificationsHandler.NotificationAction notificationAction;
private String actionString;
@@ -53,24 +56,51 @@ public class NotificationControlMessage extends GFDIMessage {
this.statusMessage = new NotificationControlStatusMessage(garminMessage, GFDIMessage.Status.ACK, NotificationControlStatusMessage.NotificationChunkStatus.OK, NotificationControlStatusMessage.NotificationStatusCode.NO_ERROR);
}
public NotificationControlMessage(GarminMessage garminMessage,
NotificationsHandler.NotificationCommand command,
String appIdentifier,
List<NotificationsHandler.AppAttribute> appAttributes) {
this.garminMessage = garminMessage;
this.command = command;
this.appIdentifier = appIdentifier;
this.appAttributes = appAttributes;
this.statusMessage = new NotificationControlStatusMessage(garminMessage, GFDIMessage.Status.ACK, NotificationControlStatusMessage.NotificationChunkStatus.OK, NotificationControlStatusMessage.NotificationStatusCode.NO_ERROR);
}
//TODO: the fact that we return three versions of this object is really ugly
public static NotificationControlMessage parseIncoming(MessageReader reader, GarminMessage garminMessage) {
final NotificationsHandler.NotificationCommand command = NotificationsHandler.NotificationCommand.fromCode(reader.readByte());
final int notificationId = reader.readInt();
if (command == GET_NOTIFICATION_ATTRIBUTES) {
final int notificationId = reader.readInt();
final Map<NotificationsHandler.NotificationAttribute, Integer> notificationAttributesMap = createGetNotificationAttributesCommand(reader);
return new NotificationControlMessage(garminMessage, command, notificationId, notificationAttributesMap);
} else if (command == PERFORM_LEGACY_NOTIFICATION_ACTION) {
final int notificationId = reader.readInt();
NotificationsHandler.LegacyNotificationAction[] values = NotificationsHandler.LegacyNotificationAction.values();
final NotificationsHandler.LegacyNotificationAction legacyNotificationAction = values[reader.readByte()];
return new NotificationControlMessage(garminMessage, command, notificationId, legacyNotificationAction);
} else if (command == PERFORM_NOTIFICATION_ACTION) {
final int notificationId = reader.readInt();
final int actionId = reader.readByte();
final NotificationsHandler.NotificationAction notificationAction = NotificationsHandler.NotificationAction.fromCode(actionId);
final String actionString = reader.readNullTerminatedString();
return new NotificationControlMessage(garminMessage, command, notificationId, notificationAction, actionString);
} else if (command == GET_APP_ATTRIBUTES) {
final String appIdentifier = reader.readNullTerminatedString();
final List<NotificationsHandler.AppAttribute> appAttributes = new ArrayList<>();
while (reader.remaining() > 0) {
final int attributeID = reader.readByte();
final NotificationsHandler.AppAttribute attribute = NotificationsHandler.AppAttribute.getByCode(attributeID);
if (attribute == null) {
LOG.error("Unknown app attribute requested {}", attributeID);
return null;
}
appAttributes.add(attribute);
}
return new NotificationControlMessage(garminMessage, command, appIdentifier, appAttributes);
}
LOG.warn("Unknown NotificationCommand in NotificationControlMessage");
@@ -142,6 +172,14 @@ public class NotificationControlMessage extends GFDIMessage {
return notificationAttributesMap;
}
public String getAppIdentifier() {
return appIdentifier;
}
public List<NotificationsHandler.AppAttribute> getAppAttributes() {
return appAttributes;
}
@Override
protected boolean generateOutgoing() {
return false;