From 57f17620b554a01ba5a347728a49106d39443b99 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Jan 2021 14:23:02 +0100
Subject: [PATCH] Fix Dendrite sync response support

---
 .../session/room/timeline/TokenChunkEventPersistor.kt       | 6 +++---
 .../sdk/internal/session/room/uploads/GetUploadsTask.kt     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index c38dcd00a7..903aef16df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -124,7 +124,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
                            direction: PaginationDirection): Result {
         monarchy
                 .awaitTransaction { realm ->
-                    Timber.v("Start persisting ${receivedChunk.events.size} events in $roomId towards $direction")
+                    Timber.v("Start persisting ${receivedChunk.events?.size} events in $roomId towards $direction")
 
                     val nextToken: String?
                     val prevToken: String?
@@ -149,7 +149,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
                     }
                             ?: ChunkEntity.create(realm, prevToken, nextToken)
 
-                    if (receivedChunk.events.isEmpty() && !receivedChunk.hasMore()) {
+                    if (receivedChunk.events.isNullOrEmpty() && !receivedChunk.hasMore()) {
                         handleReachEnd(realm, roomId, direction, currentChunk)
                     } else {
                         handlePagination(realm, roomId, direction, receivedChunk, currentChunk)
@@ -189,7 +189,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
             receivedChunk: TokenChunkEvent,
             currentChunk: ChunkEntity
     ) {
-        Timber.v("Add ${receivedChunk.events.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
+        Timber.v("Add ${receivedChunk.events?.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
         val eventList = receivedChunk.events
         val stateEvents = receivedChunk.stateEvents
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index 028c3e9193..74b8372b77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -94,7 +94,7 @@ internal class DefaultGetUploadsTask @Inject constructor(
                     nextToken = chunk.end ?: "",
                     hasMore = chunk.hasMore()
             )
-            events = chunk.events
+            events = chunk.events ?: emptyList()
         }
 
         var uploadEvents = listOf<UploadEvent>()