Add collect parcels logging

relaycorp · Sep 7, 2023 · 57b8f90 · 57b8f90
1 parent 710b0c4
commit 57b8f90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/src/main/java/tech/relaycorp/awaladroid/GatewayClientImpl.kt b/lib/src/main/java/tech/relaycorp/awaladroid/GatewayClientImpl.kt
@@ -185,6 +185,7 @@ internal constructor(
             }
 
             try {
+                logger.log(Level.INFO, "ReceiveMessages receive")
                 receiveMessages
                     .receive()
                     .collect(incomingMessageChannel::emit)

diff --git a/lib/src/main/java/tech/relaycorp/awaladroid/background/IncomingParcelBroadcastReceiver.kt b/lib/src/main/java/tech/relaycorp/awaladroid/background/IncomingParcelBroadcastReceiver.kt
@@ -8,12 +8,15 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import tech.relaycorp.awaladroid.Awala
+import tech.relaycorp.awaladroid.common.Logging.logger
+import java.util.logging.Level
 
 internal class IncomingParcelBroadcastReceiver : BroadcastReceiver() {
 
     internal var coroutineContext: CoroutineContext = Dispatchers.IO
 
     override fun onReceive(context: Context?, intent: Intent?) {
+        logger.log(Level.INFO, "IncomingParcelBroadcastReceiver onReceive")
         CoroutineScope(coroutineContext).launch {
             Awala.getContextOrThrow().gatewayClient.checkForNewMessages()
         }

diff --git a/lib/src/main/java/tech/relaycorp/awaladroid/messaging/ReceiveMessages.kt b/lib/src/main/java/tech/relaycorp/awaladroid/messaging/ReceiveMessages.kt
@@ -1,6 +1,5 @@
 package tech.relaycorp.awaladroid.messaging
 
-import java.util.logging.Level
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.flatMapLatest
@@ -26,6 +25,7 @@ import tech.relaycorp.relaynet.ramf.InvalidPayloadException
 import tech.relaycorp.relaynet.ramf.RAMFException
 import tech.relaycorp.relaynet.wrappers.cms.EnvelopedDataException
 import tech.relaycorp.relaynet.wrappers.nodeId
+import java.util.logging.Level
 
 internal class ReceiveMessages(
     private val pdcClientBuilder: () -> PDCClient = { PoWebClient.initLocal(Awala.POWEB_PORT) }
@@ -41,8 +41,10 @@ internal class ReceiveMessages(
             .flatMapLatest { nonceSigners ->
                 val pdcClient = pdcClientBuilder()
                 try {
+                    logger.log(Level.INFO, "collectParcels")
                     collectParcels(pdcClient, nonceSigners)
                         .onCompletion {
+                            logger.log(Level.INFO, "collectParcels onCompletion")
                             @Suppress("BlockingMethodInNonBlockingContext")
                             pdcClient.close()
                         }
@@ -82,6 +84,7 @@ internal class ReceiveMessages(
         pdcClient
             .collectParcels(nonceSigners, StreamingMode.CloseUponCompletion)
             .mapNotNull { parcelCollection ->
+                logger.log(Level.INFO, "Got a parcel: $parcelCollection")
                 val parcel = try {
                     parcelCollection.deserializeAndValidateParcel()
                 } catch (exp: RAMFException) {