MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 10:35:50 +01:00
Code Releases Wiki Activity

Xiaomi: Fix activity file id encoding

Browse Source
This commit is contained in:
José Rebelo 2023-10-17 21:25:16 +01:00
parent 01a552e0f7
commit d66de2f94f
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
View File

@ -107,7 +107,7 @@ public class XiaomiActivityFileId {
// bit 6 and 7 - 0 details, 1 summary // bit 6 and 7 - 0 details, 1 summary
final int detailType = flags & 3; final int detailType = flags & 3;
return new XiaomiActivityFileId(new Date(ts * 1000L), tz, version, type, subtype, detailType); return new XiaomiActivityFileId(new Date(ts * 1000L), tz, type, subtype, detailType, version);
} }
@NonNull @NonNull

48
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
View File

@ -16,18 +16,23 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity; package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
import static org.junit.Assert.*; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import org.junit.Test; import org.junit.Test;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class XiaomiActivityFileIdTest { public class XiaomiActivityFileIdTest {
@Test @Test
public void testEncode() { public void testEncode() {
final byte[] bytes = GB.hexStringToByteArray("21F328650403A0"); final byte[] expectedEncoding = GB.hexStringToByteArray("21F3286504008C");
final XiaomiActivityFileId xiaomiActivityFileId = new XiaomiActivityFileId( final XiaomiActivityFileId xiaomiActivityFileId = new XiaomiActivityFileId(
new Date(1697182497000L), new Date(1697182497000L),
4, 4,
@ -37,19 +42,42 @@ public class XiaomiActivityFileIdTest {
0 0
); );
assertArrayEquals(bytes, xiaomiActivityFileId.toBytes()); assertArrayEquals(expectedEncoding, xiaomiActivityFileId.toBytes());
} }
@Test @Test
public void testDecode() { public void testDecode() {
final byte[] bytes = GB.hexStringToByteArray("21F328650403A0"); final byte[] bytes = GB.hexStringToByteArray("21F328650403A0");
final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(bytes); final XiaomiActivityFileId expectedFileId = XiaomiActivityFileId.from(bytes);
assertEquals(1697182497000L, fileId.getTimestamp().getTime()); assertEquals(1697182497000L, expectedFileId.getTimestamp().getTime());
assertEquals(4, fileId.getTimezone()); assertEquals(4, expectedFileId.getTimezone());
assertEquals(3, fileId.getVersion()); assertEquals(3, expectedFileId.getVersion());
assertEquals(1, fileId.getType()); assertEquals(1, expectedFileId.getType());
assertEquals(8, fileId.getSubtype()); assertEquals(8, expectedFileId.getSubtype());
assertEquals(0, fileId.getDetailType()); assertEquals(0, expectedFileId.getDetailType());
}
@Test
public void testDecodeEncode() {
final byte[] bytes = GB.hexStringToByteArray("21F328650403A021F3286504008C");
final ByteBuffer bufDecode = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
final List<XiaomiActivityFileId> fileIds = new ArrayList<>();
while (bufDecode.position() < bufDecode.limit()) {
final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(bufDecode);
fileIds.add(fileId);
System.out.println(fileId);
}
final ByteBuffer bufEncode = ByteBuffer.allocate(fileIds.size() * 7).order(ByteOrder.LITTLE_ENDIAN);
for (final XiaomiActivityFileId fileId : fileIds) {
bufEncode.put(fileId.toBytes());
}
assertArrayEquals(bytes, bufEncode.array());
} }
} }