MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

Fossil/Skagen Hybrids: Fix crash on empty or multi-byte unicode alarm texts 

Fixes #3024
This commit is contained in:
Arjan Schrijver 2023-02-05 14:29:50 +01:00
parent 25be7cf12d
commit 14f05a7cf6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java
View File

@ -42,14 +42,20 @@ public class AlarmsSetRequest extends FilePutRequest {
int sizeWhole = 17 * alarms.length; int sizeWhole = 17 * alarms.length;
for(Alarm alarm : alarms){ for(Alarm alarm : alarms){
String label = alarm.getTitle(); String label = alarm.getTitle();
if (label == null || label.isEmpty()) {
label = "---";
}
label = label.substring(0, Math.min(label.length(), 15)); label = label.substring(0, Math.min(label.length(), 15));
alarm.setTitle(label); alarm.setTitle(label);
String message = alarm.getMessage(); String message = alarm.getMessage();
if (message == null || message.isEmpty()) {
message = "---";
}
message = message.substring(0, Math.min(message.length(), 50)); message = message.substring(0, Math.min(message.length(), 50));
alarm.setMessage(message); alarm.setMessage(message);
sizeWhole += label.length() + message.length(); sizeWhole += label.getBytes().length + message.getBytes().length;
} }
buffer = ByteBuffer.allocate(sizeWhole); // 4 for overall length buffer = ByteBuffer.allocate(sizeWhole); // 4 for overall length
buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.order(ByteOrder.LITTLE_ENDIAN);
@ -57,7 +63,7 @@ public class AlarmsSetRequest extends FilePutRequest {
for (Alarm alarm : alarms) { for (Alarm alarm : alarms) {
String label = alarm.getTitle(); String label = alarm.getTitle();
String message = alarm.getMessage(); String message = alarm.getMessage();
int alarmSize = 17 + label.length() + message.length(); int alarmSize = 17 + label.getBytes().length + message.getBytes().length;
buffer.put((byte) 0x00); // No information why buffer.put((byte) 0x00); // No information why
buffer.putShort((short) (alarmSize - 3)); // Alarm size, 0 above and this does not count buffer.putShort((short) (alarmSize - 3)); // Alarm size, 0 above and this does not count
@ -66,12 +72,12 @@ public class AlarmsSetRequest extends FilePutRequest {
buffer.put(alarm.getData()); buffer.put(alarm.getData());
buffer.put((byte) 0x01); // Another entry id label buffer.put((byte) 0x01); // Another entry id label
buffer.putShort((short) (label.length() + 1)); // Entry length buffer.putShort((short) (label.getBytes().length + 1)); // Entry length
buffer.put(label.getBytes()); buffer.put(label.getBytes());
buffer.put((byte) 0x00); // Null terminator buffer.put((byte) 0x00); // Null terminator
buffer.put((byte) 0x02); // Entry ID subtext buffer.put((byte) 0x02); // Entry ID subtext
buffer.putShort((short) (message.length() + 1)); // Entry length buffer.putShort((short) (message.getBytes().length + 1)); // Entry length
buffer.put(message.getBytes()); buffer.put(message.getBytes());
buffer.put((byte) 0x00); // Null terminator buffer.put((byte) 0x00); // Null terminator
} }