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

Fossil Hybrid HR: Fix crash and connection problem when using non-ascii in quick replies

Browse Source
This commit is contained in:
Andreas Shimokawa 2021-04-29 22:38:44 +02:00
parent 4716b7de18
commit 97a8aebdb3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfigurationPutRequest.java
View File

@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fo
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.file.FileHandle; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.file.FileHandle;
@ -36,7 +37,7 @@ public class QuickReplyConfigurationPutRequest extends FilePutRequest {
byte[] mysteryHeader = new byte[]{(byte) 0x02, (byte) 0x0b, (byte) 0x46, (byte) 0x00, (byte) 0x03, (byte) 0x19, (byte) 0x00, (byte) 0x00, (byte) 0x00}; byte[] mysteryHeader = new byte[]{(byte) 0x02, (byte) 0x0b, (byte) 0x46, (byte) 0x00, (byte) 0x03, (byte) 0x19, (byte) 0x00, (byte) 0x00, (byte) 0x00};
Charset charsetUTF8 = Charset.forName("UTF-8"); Charset charsetUTF8 = StandardCharsets.UTF_8;
String iconName = StringUtils.terminateNull("icMessage.icon"); String iconName = StringUtils.terminateNull("icMessage.icon");
byte[] iconNameBytes = iconName.getBytes(charsetUTF8); byte[] iconNameBytes = iconName.getBytes(charsetUTF8);
@ -46,7 +47,7 @@ public class QuickReplyConfigurationPutRequest extends FilePutRequest {
reply = reply.substring(0, 50); reply = reply.substring(0, 50);
} }
processedReplies[index] = StringUtils.terminateNull(reply); processedReplies[index] = StringUtils.terminateNull(reply);
fileLength += 8 + processedReplies[index].length() + iconNameBytes.length; fileLength += 8 + processedReplies[index].getBytes(charsetUTF8).length + iconNameBytes.length;
} }
ByteBuffer mainBuffer = ByteBuffer.allocate(mysteryHeader.length + 4 + fileLength); ByteBuffer mainBuffer = ByteBuffer.allocate(mysteryHeader.length + 4 + fileLength);