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

Lefun: Limit notification length further

Browse Source 
In addition to the 255 pieces limit, the band also uses a byte for total message length, so cap that too to not run over previous message data.
This commit is contained in:
Yukai Li 2020-10-05 11:35:31 -06:00 committed by Gitea
parent 2c1167b1b3
commit 31078647b1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/NotificationCommand.java
View File

@ -37,6 +37,7 @@ public class NotificationCommand extends BaseCommand {
public static final byte EXTENDED_SERVICE_TYPE_KAKAOTALK = 6;
public static final int MAX_PAYLOAD_LENGTH = 13;
public static final int MAX_MESSAGE_LENGTH = 254;
private byte serviceType;
private byte totalPieces;

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/AbstractSendNotificationRequest.java
View File

@ -59,20 +59,23 @@ public abstract class AbstractSendNotificationRequest extends Request {
.getCharacteristic(LefunConstants.UUID_CHARACTERISTIC_LEFUN_WRITE);
List<NotificationCommand> commandList = new ArrayList<>();
int charsWritten = 0;
for (int i = 0; i < 0xff; ++i) {
NotificationCommand cmd = new NotificationCommand();
cmd.setServiceType(notificationType);
cmd.setExtendedServiceType(extendedNotificationType);
cmd.setCurrentPiece((byte) (i + 1));
int maxPayloadLength = NotificationCommand.MAX_PAYLOAD_LENGTH;
if (reserveSpaceForExtended) maxPayloadLength -= 1;
maxPayloadLength = Math.min(maxPayloadLength, buffer.limit() - buffer.position());
maxPayloadLength = Math.min(maxPayloadLength, NotificationCommand.MAX_MESSAGE_LENGTH - charsWritten);
if (maxPayloadLength == 0 && i != 0) break;
byte[] payload = new byte[maxPayloadLength];
buffer.get(payload);
NotificationCommand cmd = new NotificationCommand();
cmd.setServiceType(notificationType);
cmd.setExtendedServiceType(extendedNotificationType);
cmd.setCurrentPiece((byte) (i + 1));
cmd.setPayload(payload);
charsWritten += maxPayloadLength;
commandList.add(cmd);
}