fix(Message): Only make parcelId available in OutgoingMessage

relaycorp · Mar 10, 2021 · aad9ffa · aad9ffa
1 parent 9455af4
commit aad9ffa
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/lib/src/main/java/tech/relaycorp/relaydroid/messaging/IncomingMessage.kt b/lib/src/main/java/tech/relaycorp/relaydroid/messaging/IncomingMessage.kt
@@ -19,13 +19,12 @@ import tech.relaycorp.relaynet.wrappers.cms.EnvelopedDataException
  * @property ack The function to call as soon as the message has been processed.
  */
 public class IncomingMessage internal constructor(
-    parcelId: ParcelId,
     public val type: String,
     public val content: ByteArray,
     public val senderEndpoint: ThirdPartyEndpoint,
     public val recipientEndpoint: FirstPartyEndpoint,
     public val ack: suspend () -> Unit
-) : Message(parcelId) {
+) : Message() {
 
     internal companion object {
         @Throws(
@@ -52,7 +51,6 @@ public class IncomingMessage internal constructor(
 
             val serviceMessage = parcel.unwrapPayload(recipientEndpoint.keyPair.private)
             return IncomingMessage(
-                parcelId = ParcelId(parcel.id),
                 type = serviceMessage.type,
                 content = serviceMessage.content,
                 senderEndpoint = sender,

diff --git a/lib/src/main/java/tech/relaycorp/relaydroid/messaging/Message.kt b/lib/src/main/java/tech/relaycorp/relaydroid/messaging/Message.kt
@@ -2,7 +2,5 @@ package tech.relaycorp.relaydroid.messaging
 
 /**
  * A service message.
- *
- * @property parcelId The parcel id.
  */
-public abstract class Message internal constructor(public val parcelId: ParcelId)
+public abstract class Message
diff --git a/lib/src/main/java/tech/relaycorp/relaydroid/messaging/OutgoingMessage.kt b/lib/src/main/java/tech/relaycorp/relaydroid/messaging/OutgoingMessage.kt
@@ -17,15 +17,16 @@ import tech.relaycorp.relaynet.wrappers.x509.Certificate
  * @property senderEndpoint The first-party endpoint that created the message.
  * @property recipientEndpoint The third-party endpoint that should receive the message.
  * @property parcelExpiryDate The expiry date of the parcel.
+ * @property parcelId The parcel id.
  */
 public class OutgoingMessage
 private constructor(
     public val senderEndpoint: FirstPartyEndpoint,
     public val recipientEndpoint: ThirdPartyEndpoint,
     public val parcelExpiryDate: ZonedDateTime = maxExpiryDate(),
-    parcelId: ParcelId,
+    public val parcelId: ParcelId,
     internal val parcelCreationDate: ZonedDateTime = ZonedDateTime.now()
-) : Message(parcelId) {
+) : Message() {
 
     internal lateinit var parcel: Parcel
         private set

diff --git a/lib/src/test/java/tech/relaycorp/relaydroid/messaging/IncomingMessageTest.kt b/lib/src/test/java/tech/relaycorp/relaydroid/messaging/IncomingMessageTest.kt
@@ -51,6 +51,5 @@ internal class IncomingMessageTest {
         assertEquals(PDACertPath.PRIVATE_ENDPOINT, message.recipientEndpoint.identityCertificate)
         assertEquals(serviceMessage.type, message.type)
         assertArrayEquals(serviceMessage.content, message.content)
-        assertEquals(parcel.id, message.parcelId.value)
     }
 }
diff --git a/lib/src/test/java/tech/relaycorp/relaydroid/messaging/ReceiveMessagesTest.kt b/lib/src/test/java/tech/relaycorp/relaydroid/messaging/ReceiveMessagesTest.kt
@@ -65,7 +65,6 @@ internal class ReceiveMessagesTest {
         assertTrue(pdcClient.wasClosed)
         assertTrue(collectParcelsCall.wasCalled)
         assertEquals(1, messages.size)
-        assertEquals(parcel.id, messages.first().parcelId.value)
     }
 
     @Test

diff --git a/lib/src/test/java/tech/relaycorp/relaydroid/test/MessageFactory.kt b/lib/src/test/java/tech/relaycorp/relaydroid/test/MessageFactory.kt
@@ -1,9 +1,7 @@
 package tech.relaycorp.relaydroid.test
 
-import java.util.UUID
 import tech.relaycorp.relaydroid.messaging.IncomingMessage
 import tech.relaycorp.relaydroid.messaging.OutgoingMessage
-import tech.relaycorp.relaydroid.messaging.ParcelId
 import tech.relaycorp.relaynet.messages.payloads.ServiceMessage
 import tech.relaycorp.relaynet.ramf.RecipientAddressType
 
@@ -18,7 +16,6 @@ internal object MessageFactory {
     )
 
     fun buildIncoming() = IncomingMessage(
-        parcelId = ParcelId(UUID.randomUUID().toString()),
         type = serviceMessage.type,
         content = serviceMessage.content,
         senderEndpoint = ThirdPartyEndpointFactory.buildPublic(),