Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdd1adf0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[AsyncHybridViewInflation] Fix crash in Historic Message handling" into main

parents 318f477d 01658fc7
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -217,8 +217,9 @@ internal object SingleLineViewInflater {
        var currentGroup: MutableList<MessagingStyle.Message>? = null
        var currentSenderKey: CharSequence? = null
        val groups = mutableListOf<MutableList<MessagingStyle.Message>>()
        for (i in 0 until (historicMessages.size + messages.size)) {
            val message = if (i < historicMessages.size) historicMessages[i] else messages[i]
        val histSize = historicMessages.size
        for (i in 0 until (histSize + messages.size)) {
            val message = if (i < histSize) historicMessages[i] else messages[i - histSize]

            val sender = message.senderPerson
            val senderKey = sender?.getKeyOrName()