From cdc00b0d1c02ee221f111eac10f7a5d0047d7fd5 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Thu, 9 May 2024 00:06:13 -0400 Subject: [PATCH] Don't overwrite the modified Flipper page --- .../hiddenramblings/tagmo/nfctech/Flipper.kt | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/hiddenramblings/tagmo/nfctech/Flipper.kt b/app/src/main/java/com/hiddenramblings/tagmo/nfctech/Flipper.kt index 1ced0c780..9aa785fa8 100644 --- a/app/src/main/java/com/hiddenramblings/tagmo/nfctech/Flipper.kt +++ b/app/src/main/java/com/hiddenramblings/tagmo/nfctech/Flipper.kt @@ -49,20 +49,24 @@ object Flipper { .append(Debug.separator).append("Tearing 2: 00") .append(Debug.separator).append("Pages total: 135") pages.forEachIndexed{ index, bytes -> - if (index == 133) { - pages[1]?.let { pages[0]?.copyOf(3)?.plus(it) }?.let { uid -> - "Page $index: ${byteArrayOf( - uid[1] xor uid[3] xor 0xAA.toByte(), - uid[2] xor uid[4] xor 0x55, - uid[3] xor uid[5] xor 0xAA.toByte(), - uid[4] xor uid[6] xor 0x55).toHex().hexFormat}" + when (index) { + 133 -> { + pages[1]?.let { pages[0]?.copyOf(3)?.plus(it) }?.let { uid -> + "Page $index: ${byteArrayOf( + uid[1] xor uid[3] xor 0xAA.toByte(), + uid[2] xor uid[4] xor 0x55, + uid[3] xor uid[5] xor 0xAA.toByte(), + uid[4] xor uid[6] xor 0x55).toHex().hexFormat}" + } + } + 134 -> { + "Page $index: ${byteArrayOf(0x80.toByte(), 0x80.toByte(), 0, 0).toHex().hexFormat}" + } + else -> { + bytes?.let { + contents.append(Debug.separator).append("Page $index: ${it.toHex().hexFormat}") + } } - } - if (index == 134) { - "Page $index: ${byteArrayOf(0x80.toByte(), 0x80.toByte(), 0, 0).toHex().hexFormat}" - } - bytes?.let { - contents.append(Debug.separator).append("Page $index: ${it.toHex().hexFormat}") } } val nfcFile = File(directory, "$filename.nfc")