File tree 2 files changed +11
-4
lines changed
androidTest/java/org/xmtp/android/library
main/java/org/xmtp/android/library
2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -128,14 +128,17 @@ class LocalInstrumentedTest {
128
128
date.time = date.time - 5000
129
129
convo.send(text = " 10 seconds ago" , sentAt = date)
130
130
Thread .sleep(5000 )
131
+ convo.send(text = " now first" )
131
132
convo.send(text = " now" )
132
133
val messages = convo.messages()
133
- assertEquals(2 , messages.size)
134
+ assertEquals(3 , messages.size)
135
+ val messagesLimit = convo.messages(limit = 2 )
136
+ assertEquals(2 , messagesLimit.size)
134
137
val nowMessage = messages[0 ]
135
138
assertEquals(" now" , nowMessage.body)
136
- val messages2 = convo.messages(before = nowMessage.sent)
139
+ val messages2 = convo.messages(limit = 1 , before = nowMessage.sent)
137
140
val tenSecondsAgoMessage = messages2[0 ]
138
- assertEquals(" 10 seconds ago " , tenSecondsAgoMessage.body)
141
+ assertEquals(" now first " , tenSecondsAgoMessage.body)
139
142
val messages3 = convo.messages(after = tenSecondsAgoMessage.sent)
140
143
val nowMessage2 = messages3[0 ]
141
144
assertEquals(" now" , nowMessage2.body)
Original file line number Diff line number Diff line change @@ -123,14 +123,18 @@ data class GRPCApiClient(
123
123
}
124
124
125
125
override suspend fun envelopes (topic : String , pagination : Pagination ? ): List <Envelope > {
126
- val envelopes: MutableList <Envelope > = mutableListOf ()
126
+ var envelopes: MutableList <Envelope > = mutableListOf ()
127
127
var hasNextPage = true
128
128
var cursor: Cursor ? = null
129
129
while (hasNextPage) {
130
130
val response = query(topic = topic, pagination = pagination, cursor = cursor)
131
131
envelopes.addAll(response.envelopesList)
132
132
cursor = response.pagingInfo.cursor
133
133
hasNextPage = response.envelopesList.isNotEmpty() && response.pagingInfo.hasCursor()
134
+ if (pagination?.limit != null && envelopes.size >= pagination.limit) {
135
+ envelopes = envelopes.take(pagination.limit).toMutableList()
136
+ break
137
+ }
134
138
}
135
139
return envelopes
136
140
}
You can’t perform that action at this time.
0 commit comments