Fix unread messages marker being hidden in collapsed membership item

[SpiritCroc]

Scenario: the last read event in a chat is a membership change. After
that, at least two new membership changes were added, followed by normal
messages. Due to the membership changes being collapsed by default, in
this scenario the read marker would not show, since in the loop, we
would overwrite the appendReadMarker with the value for the last eventId
of the merged item, instead of showing it if any of the items matched.

Signed-off-by: Tobias Büttner dev@spiritcroc.de

Pull Request Checklist

• Changes has been tested on an Android device or Android emulator with API 21
• Pull request is based on the develop branch
• Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
• Pull request includes a sign off

[bmarty]

LGTM, thanks.

So just to confirm, the read marker will be displayed above the collapsed events with this fix? And in the correct place (as before) if the state events are expanded?

[SpiritCroc]

Yes, that's how it behaves for me now. I've been testing using /myroomnick to generate membership events from desktop.

[bmarty]

Thanks! I merge the PR then.