felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 16:13:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list

Browse Source
This commit is contained in:
ismailgulek
2021-11-26 01:45:37 +03:00
parent 00fdac165a 5b9ccbdaa0
commit 5c7b0ed5b2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/DataSources/RoomDataSource.m
+4 -4
View File
@@ -249,7 +249,7 @@ const CGFloat kTypingCellHeight = 24;
if (self.threadId)
{
// if in a thread, ignore non-root event or events from other threads
if (![event.eventId isEqualToString:self.threadId] && ![event.threadIdentifier isEqualToString:self.threadId])
if (![event.eventId isEqualToString:self.threadId] && ![event.threadId isEqualToString:self.threadId])
{
// Ignore the event
return NO;
@@ -259,7 +259,7 @@ const CGFloat kTypingCellHeight = 24;
{
MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
inRoom:event.roomId];
if (![relatedEvent.threadIdentifier isEqualToString:self.threadId])
if (![relatedEvent.threadId isEqualToString:self.threadId])
{
// ignore the event
return NO;
@@ -269,7 +269,7 @@ const CGFloat kTypingCellHeight = 24;
else
{
// if not in a thread, ignore all threaded events
if (event.threadIdentifier)
if (event.threadId)
{
// ignore the event
return NO;
@@ -279,7 +279,7 @@ const CGFloat kTypingCellHeight = 24;
{
MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
inRoom:event.roomId];
if (relatedEvent.threadIdentifier)
if (relatedEvent.threadId)
{
// ignore the event
return NO;