From b7a89f40552d75f4daaf690cd871b31ecc15b710 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 12 Jan 2021 15:37:48 +0100
Subject: [PATCH] Fix / Syncs breaking on dendrite

---
 .../matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt | 2 +-
 .../sdk/internal/session/sync/model/RoomSyncAccountData.kt      | 2 +-
 .../sdk/internal/session/sync/model/RoomSyncEphemeral.kt        | 2 +-
 .../android/sdk/internal/session/sync/model/RoomSyncState.kt    | 2 +-
 .../android/sdk/internal/session/sync/model/RoomSyncTimeline.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 6859df1d37..95fbb2f1b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -456,7 +456,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     }
 
     private fun handleRoomAccountDataEvents(realm: Realm, roomId: String, accountData: RoomSyncAccountData) {
-        for (event in accountData.events) {
+        accountData.events?.forEach { event ->
             val eventType = event.getClearType()
             if (eventType == EventType.TAG) {
                 val content = event.getClearContent().toModel<RoomTagContent>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
index 1c35d812ee..9e0ccde16b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
@@ -25,5 +25,5 @@ internal data class RoomSyncAccountData(
         /**
          * List of account data events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
index d59dddb3ea..a2e044d947 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
@@ -26,5 +26,5 @@ internal data class RoomSyncEphemeral(
         /**
          * List of ephemeral events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
index 5355b7eef1..c825cbf31c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
@@ -27,5 +27,5 @@ internal data class RoomSyncState(
         /**
          * List of state events (array of Event). The resulting state corresponds to the *start* of the timeline.
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
index ddf430099a..ce51958f73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
@@ -27,7 +27,7 @@ internal data class RoomSyncTimeline(
         /**
          * List of events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList(),
+        @Json(name = "events") val events: List<Event>? = emptyList(),
 
         /**
          * Boolean which tells whether there are more events on the server