Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: integrate `shouldPush' for React Native #184

Merged
merged 3 commits into from
Feb 20, 2024
Merged

feat: integrate `shouldPush' for React Native #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dcfea8
Add shouldPush property to SendOptions
Feb 19, 2024
edfa01b
Add shouldPush property to DecryptedMessage class
Feb 19, 2024
01eca24
Add shouldPush parameter to ConversationV2 and MessageV2Builder
Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions library/src/main/java/org/xmtp/android/library/ConversationV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ data class ConversationV2(
topic = topic,
keyMaterial = keyMaterial,
codec = codec,
shouldPush = options?.shouldPush
)

val newTopic = if (options?.ephemeral == true) ephemeralTopic else topic
Expand Down
3 changes: 2 additions & 1 deletion library/src/main/java/org/xmtp/android/library/SendOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ import org.xmtp.proto.message.contents.Content
data class SendOptions(
var compression: EncodedContentCompression? = null,
var contentType: Content.ContentTypeId? = null,
var ephemeral: Boolean = false
var ephemeral: Boolean = false,
var shouldPush: Boolean? = null
)
3 changes: 2 additions & 1 deletion library/src/main/java/org/xmtp/android/library/messages/DecryptedMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ data class DecryptedMessage(
var encodedContent: EncodedContent,
var senderAddress: String,
var sentAt: Date,
var topic: String = ""
var topic: String = "",
var shouldPush: Boolean?
)
4 changes: 3 additions & 1 deletion library/src/main/java/org/xmtp/android/library/messages/MessageV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ class MessageV2Builder(val senderHmac: ByteArray? = null, val shouldPush: Boolea
topic: String,
keyMaterial: ByteArray,
codec: Codec,
shouldPush: Boolean? = null
): MessageV2Builder {
val payload = encodedContent.toByteArray()
val date = Date()
Expand All @@ -160,12 +161,13 @@ class MessageV2Builder(val senderHmac: ByteArray? = null, val shouldPush: Boolea
Crypto.deriveKey(keyMaterial, ByteArray(0), infoEncoded),
headerBytes
)
val calculatedShouldPush = shouldPush ?: shouldPush(codec = codec, content = codec.decode(encodedContent))

return buildFromCipherText(
headerBytes,
ciphertext,
senderHmacGenerated,
shouldPush(codec = codec, content = codec.decode(encodedContent)),
calculatedShouldPush,
)
}
}
Expand Down
Loading