diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt index 86bbf475..eb928fde 100644 --- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt +++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt @@ -64,7 +64,7 @@ class BluetoothMeshService(private val context: Context) { // Wire up PacketProcessor reference for recursive handling in MessageHandler messageHandler.packetProcessor = packetProcessor - // startPeriodicDebugLogging() + startPeriodicDebugLogging() } /** diff --git a/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt b/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt index 19082b75..e10c6ad6 100644 --- a/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt +++ b/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt @@ -1,6 +1,7 @@ package com.bitchat.android.model import android.os.Parcelable +import com.google.gson.GsonBuilder import kotlinx.parcelize.Parcelize import java.nio.ByteBuffer import java.nio.ByteOrder @@ -351,12 +352,16 @@ data class DeliveryAck( val recipientID: String, val recipientNickname: String, val timestamp: Date = Date(), - val hopCount: UByte + val hopCount: UInt ) : Parcelable { + + private val gson = GsonBuilder() + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") + .create() fun encode(): ByteArray? { return try { - com.google.gson.Gson().toJson(this).toByteArray(Charsets.UTF_8) + gson.toJson(this).toByteArray(Charsets.UTF_8) } catch (e: Exception) { null }