From 4bc6909aa8728af8c3a9aaa7d4d764a37ae81d1a Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 19 Jul 2023 14:39:23 +0200
Subject: [PATCH] TimelineDiff: use firstOrNull even if it shouldn't never be
 empty

---
 .../android/libraries/matrix/impl/timeline/TimelineDiffExt.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
index 9b47d8040b..59165463bb 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
@@ -28,7 +28,7 @@ import org.matrix.rustcomponents.sdk.TimelineItem
 internal fun TimelineDiff.eventOrigin(): EventItemOrigin? {
     return when (change()) {
         TimelineChange.APPEND -> {
-            append()?.first()?.eventOrigin()
+            append()?.firstOrNull()?.eventOrigin()
         }
         TimelineChange.PUSH_BACK -> {
             pushBack()?.eventOrigin()
@@ -43,7 +43,7 @@ internal fun TimelineDiff.eventOrigin(): EventItemOrigin? {
             insert()?.item?.eventOrigin()
         }
         TimelineChange.RESET -> {
-            reset()?.first()?.eventOrigin()
+            reset()?.firstOrNull()?.eventOrigin()
         }
         else -> null
     }