Skip to content

Commit 5cba590

Browse files
authored
Fetch all messages (#88)
* add api client with grpc kotlin * change the message fetching to fetch all messages * fix up the tests
1 parent e1d1450 commit 5cba590

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

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

+6-8
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,14 @@ class LocalInstrumentedTest {
129129
convo.send(text = "10 seconds ago", sentAt = date)
130130
Thread.sleep(5000)
131131
convo.send(text = "now")
132-
val messages = convo.messages(limit = 1)
133-
assertEquals(1, messages.size)
132+
val messages = convo.messages()
133+
assertEquals(2, messages.size)
134134
val nowMessage = messages[0]
135135
assertEquals("now", nowMessage.body)
136-
val messages2 = convo.messages(limit = 1, before = nowMessage.sent)
137-
assertEquals(1, messages2.size)
136+
val messages2 = convo.messages(before = nowMessage.sent)
138137
val tenSecondsAgoMessage = messages2[0]
139138
assertEquals("10 seconds ago", tenSecondsAgoMessage.body)
140-
val messages3 = convo.messages(limit = 1, after = tenSecondsAgoMessage.sent)
141-
assertEquals(1, messages3.size)
139+
val messages3 = convo.messages(after = tenSecondsAgoMessage.sent)
142140
val nowMessage2 = messages3[0]
143141
assertEquals("now", nowMessage2.body)
144142
}
@@ -247,8 +245,8 @@ class LocalInstrumentedTest {
247245
Thread.sleep(10000)
248246
convo.send(text = "now")
249247
val allMessages = convo.messages()
250-
val messages = convo.messages(limit = 1)
251-
assertEquals(1, messages.size)
248+
val messages = convo.messages()
249+
assertEquals(2, messages.size)
252250
val nowMessage = messages[0]
253251
assertEquals("now", nowMessage.body)
254252
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ data class ConversationV1(
4444
): List<DecodedMessage> {
4545
val pagination = Pagination(limit = limit, before = before, after = after)
4646
val result = runBlocking {
47-
client.apiClient.queryTopic(topic = topic, pagination = pagination)
47+
client.apiClient.envelopes(topic = topic.description, pagination = pagination)
4848
}
4949

50-
return result.envelopesList.mapNotNull { envelope ->
50+
return result.mapNotNull { envelope ->
5151
decodeOrNull(envelope = envelope)
5252
}
5353
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,13 @@ data class ConversationV2(
6565
): List<DecodedMessage> {
6666
val pagination = Pagination(limit = limit, before = before, after = after)
6767
val result = runBlocking {
68-
client.apiClient.query(
68+
client.apiClient.envelopes(
6969
topic = topic,
70-
pagination = pagination,
71-
cursor = null
70+
pagination = pagination
7271
)
7372
}
7473

75-
return result.envelopesList.mapNotNull { envelope ->
74+
return result.mapNotNull { envelope ->
7675
decodeEnvelopeOrNull(envelope)
7776
}
7877
}

0 commit comments

Comments
 (0)