Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt to event changes

Browse source
This commit is contained in:
ismailgulek 2021-11-26 01:42:53 +03:00
parent fc87a3534d
commit 68ac7cd49d
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Riot/Modules/Room/DataSources/RoomDataSource.m
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;

6
Riot/Modules/Room/RoomViewController.m
View file

@ -3211,7 +3211,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
BOOL showThreadOption = RiotSettings.shared.enableThreads
&& !self.roomDataSource.threadId
&& !selectedEvent.threadIdentifier;
&& !selectedEvent.threadId;
if (showThreadOption && [self canCopyEvent:selectedEvent andCell:cell])
{
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionCopy]
@ -4022,7 +4022,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
- (void)roomDataSource:(RoomDataSource *)roomDataSource didTapThread:(MXThread *)thread
{
[self openThreadWithId:thread.identifier];
[self openThreadWithId:thread.id];
}
#pragma mark - Segues
@ -5937,7 +5937,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
BOOL showMoreOption = (event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForStates)
|| (!event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForMessages);
BOOL showThreadOption = RiotSettings.shared.enableThreads && !self.roomDataSource.threadId && !event.threadIdentifier;
BOOL showThreadOption = RiotSettings.shared.enableThreads && !self.roomDataSource.threadId && !event.threadId;
NSMutableArray<RoomContextualMenuItem*> *items = [NSMutableArray arrayWithCapacity:5];

2
Riot/Modules/Room/Search/RoomSearchViewController.m
View file

@ -317,7 +317,7 @@
[RoomDataSource loadRoomDataSourceWithRoomId:selectedSearchEvent.roomId
initialEventId:selectedSearchEvent.eventId
threadId:selectedSearchEvent.threadIdentifier
threadId:selectedSearchEvent.threadId
andMatrixSession:selectedSearchEventSession
onComplete:^(RoomDataSource *roomDataSource) {