Skip to content

Commit 2865911

Browse files
committed
Updating shouldPush flag and removing issues in instrumental testing
1 parent b1b7797 commit 2865911

File tree

10 files changed

+10
-12
lines changed

10 files changed

+10
-12
lines changed

library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ClientTest {
6363
)
6464
}
6565

66-
@Ignore
66+
@Ignore("CI Issues")
6767
@Test
6868
fun testCanBeCreatedWithV1Bundle() {
6969
val fakeWallet = PrivateKeyBuilder()
@@ -81,7 +81,7 @@ class ClientTest {
8181
)
8282
}
8383

84-
@Ignore
84+
@Ignore("CI Issues")
8585
@Test
8686
fun testV3CanBeCreatedWithBundle() {
8787
val context = InstrumentationRegistry.getInstrumentation().targetContext
@@ -111,7 +111,7 @@ class ClientTest {
111111
)
112112
}
113113

114-
@Ignore
114+
@Ignore("CI Issues")
115115
@Test
116116
fun testCreatesAV3Client() {
117117
val context = InstrumentationRegistry.getInstrumentation().targetContext

library/src/androidTest/java/org/xmtp/android/library/CodecTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class CodecTest {
148148
val keys = aliceClient.conversations.getHmacKeys()
149149
}
150150

151-
@Ignore
151+
@Ignore("CI Issues")
152152
@Test
153153
fun testReturnsAllHMACKeys() {
154154
val alix = PrivateKeyBuilder()

library/src/androidTest/java/org/xmtp/android/library/GroupMembershipChangeTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.xmtp.android.library.messages.walletAddress
1414
import uniffi.xmtpv3.org.xmtp.android.library.codecs.GroupMembershipChangeCodec
1515
import uniffi.xmtpv3.org.xmtp.android.library.codecs.GroupMembershipChanges
1616

17-
@Ignore
17+
@Ignore("CI Issues")
1818
@RunWith(AndroidJUnit4::class)
1919
class GroupMembershipChangeTest {
2020
lateinit var fakeApiClient: FakeApiClient

library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.xmtp.android.library.messages.PrivateKey
1919
import org.xmtp.android.library.messages.PrivateKeyBuilder
2020
import org.xmtp.android.library.messages.walletAddress
2121

22-
@Ignore
22+
@Ignore("CI Issues")
2323
@RunWith(AndroidJUnit4::class)
2424
class GroupTest {
2525
lateinit var fakeApiClient: FakeApiClient

library/src/main/java/org/xmtp/android/library/ConversationV1.kt

-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ data class ConversationV1(
127127
encodedContent = encodedMessage,
128128
senderAddress = header.sender.walletAddress,
129129
sentAt = message.v1.sentAt,
130-
shouldPush = false,
131130
)
132131
} catch (e: Exception) {
133132
throw XMTPException("Error decrypting message", e)

library/src/main/java/org/xmtp/android/library/ConversationV2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ data class ConversationV2(
250250
topic = topic,
251251
keyMaterial = keyMaterial,
252252
codec = codec,
253-
shouldPush = options?.shouldPush
253+
shouldPush = options?.__shouldPush
254254
)
255255

256256
val newTopic = if (options?.ephemeral == true) ephemeralTopic else topic

library/src/main/java/org/xmtp/android/library/Group.kt

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ class Group(val client: Client, private val libXMTPGroup: FfiGroup) {
125125
encodedContent = message.decode().encodedContent,
126126
senderAddress = message.senderAddress,
127127
sentAt = Date(),
128-
shouldPush = false,
129128
)
130129
}
131130

library/src/main/java/org/xmtp/android/library/SendOptions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ data class SendOptions(
66
var compression: EncodedContentCompression? = null,
77
var contentType: Content.ContentTypeId? = null,
88
var ephemeral: Boolean = false,
9-
var shouldPush: Boolean? = null
9+
var __shouldPush: Boolean? = null
1010
)

library/src/main/java/org/xmtp/android/library/messages/DecryptedMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ data class DecryptedMessage(
99
var senderAddress: String,
1010
var sentAt: Date,
1111
var topic: String = "",
12-
var shouldPush: Boolean?
12+
var shouldPush: Boolean? = null,
1313
)

library/src/main/java/org/xmtp/android/library/messages/MessageV2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class MessageV2Builder(val senderHmac: ByteArray? = null, val shouldPush: Boolea
121121
senderAddress = signed.sender.walletAddress,
122122
sentAt = Date(header.createdNs / 1_000_000),
123123
topic = topic,
124-
shouldPush = false,
124+
shouldPush = message.shouldPush,
125125
)
126126
}
127127

0 commit comments

Comments
 (0)