Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Activer l'affichage en thread (#878) #879

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Activer l'affichage en thread (#878) #879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f7966c4
Activer l'affichage en thread (#878)
Sep 22, 2023
56910f6
Activate commented part of code relative to Threads
Oct 31, 2023
a4de2d1
Activate "Reply in thread" and "Thread list in room" buttons and actions
Oct 31, 2023
66a7e04
Ne permettre d'activer les threads que pour les utilisateurs DINUM
Nov 2, 2023
64b9384
Ne pas afficher de lien explicatif Element dans la pop-up d'activatio…
Nov 2, 2023
058155f
Mettre le bouton d'activation de thread de la bonne couleur et label …
Nov 2, 2023
35d3fa9
Fix comment and typo
Nov 2, 2023
a5645df
Add changelog
Nov 2, 2023
a47d500
Setup feature activation by instance for Tchap
Jan 4, 2024
ab8da1c
Use homeServer rather than identityServer. Rename `featureByInstance`…
Jan 4, 2024
97e3d5e
Refactor Feature Flag variables names
Jan 23, 2024
98abf67
Exposes objC MXKAccountManager.h to Swift
Feb 8, 2024
1941edb
Project configuration to compile
Feb 8, 2024
2e29c31
Project settings
Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Riot/Managers/PushNotification/PushNotificationService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,28 +487,28 @@ - (void)handleNotificationInlineReplyForRoomId:(NSString*)roomId
// initialize data source for a thread or a room
__block MXKRoomDataSource *dataSource;
dispatch_group_t dispatchGroupDataSource = dispatch_group_create();
// Tchap: Disable Threads
// if (RiotSettings.shared.enableThreads && threadId)
// {
// dispatch_group_enter(dispatchGroupDataSource);
// [ThreadDataSource loadRoomDataSourceWithRoomId:roomId
// initialEventId:nil
// threadId:threadId
// andMatrixSession:mxSession
// onComplete:^(MXKRoomDataSource *threadDataSource) {
// dataSource = threadDataSource;
// dispatch_group_leave(dispatchGroupDataSource);
// }];
// }
// else
// {

if (RiotSettings.shared.enableThreads && threadId)
{
dispatch_group_enter(dispatchGroupDataSource);
[ThreadDataSource loadRoomDataSourceWithRoomId:roomId
initialEventId:nil
threadId:threadId
andMatrixSession:mxSession
onComplete:^(MXKRoomDataSource *threadDataSource) {
dataSource = threadDataSource;
dispatch_group_leave(dispatchGroupDataSource);
}];
}
else
{
dispatch_group_enter(dispatchGroupDataSource);
MXKRoomDataSourceManager *manager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:mxSession];
[manager roomDataSourceForRoom:roomId create:YES onComplete:^(MXKRoomDataSource *roomDataSource) {
dataSource = roomDataSource;
dispatch_group_leave(dispatchGroupDataSource);
}];
// }
}

dispatch_group_notify(dispatchGroupDataSource, dispatch_get_main_queue(), ^{
if (responseText != nil && responseText.length != 0)
Expand Down
12 changes: 6 additions & 6 deletions Riot/Modules/Room/CellData/RoomBubbleCellData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,9 +838,9 @@ - (CGFloat)threadSummaryViewHeightForEventId:(NSString*)eventId
// component is not a thread root
return 0;
}
return 0; // Threads are disabled in Tchap
// return PlainRoomCellLayoutConstants.threadSummaryViewTopMargin +
// [ThreadSummaryView contentViewHeightForThread:component.thread fitting:self.maxTextViewWidth];
// return 0; // Threads are disabled in Tchap
return PlainRoomCellLayoutConstants.threadSummaryViewTopMargin +
[ThreadSummaryView contentViewHeightForThread:component.thread fitting:self.maxTextViewWidth];
}

- (CGFloat)fromAThreadViewHeightForEventId:(NSString*)eventId
Expand All @@ -866,9 +866,9 @@ - (CGFloat)fromAThreadViewHeightForEventId:(NSString*)eventId
// event is not in a thread
return 0;
}
return 0; // Threads are disabled in Tchap
// return PlainRoomCellLayoutConstants.fromAThreadViewTopMargin +
// [FromAThreadView contentViewHeightForEvent:component.event fitting:self.maxTextViewWidth];
// return 0; // Threads are disabled in Tchap
return PlainRoomCellLayoutConstants.fromAThreadViewTopMargin +
[FromAThreadView contentViewHeightForEvent:component.event fitting:self.maxTextViewWidth];
}

- (CGFloat)urlPreviewHeightForEventId:(NSString*)eventId
Expand Down
131 changes: 64 additions & 67 deletions Riot/Modules/Room/DataSources/RoomDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,47 +266,46 @@ - (void)fetchEncryptionTrustedLevel

- (BOOL)shouldQueueEventForProcessing:(MXEvent *)event roomState:(MXRoomState *)roomState direction:(MXTimelineDirection)direction
{
// Tchap: Disable Threads
// if (self.threadId)
// {
// // if in a thread, ignore non-root event or events from other threads
// if (![event.eventId isEqualToString:self.threadId] && ![event.threadId isEqualToString:self.threadId])
// {
// // Ignore the event
// return NO;
// }
// // also ignore events related to un-threaded or events from other threads
// if (!event.isInThread && event.relatesTo.eventId)
// {
// MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
// inRoom:event.roomId];
// if (![relatedEvent.threadId isEqualToString:self.threadId])
// {
// // ignore the event
// return NO;
// }
// }
// }
// else if (RiotSettings.shared.enableThreads)
// {
// // if not in a thread, ignore all threaded events
// if (event.isInThread)
// {
// // ignore the event
// return NO;
// }
// // also ignore events related to threaded events
// if (event.relatesTo.eventId)
// {
// MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
// inRoom:event.roomId];
// if (relatedEvent.isInThread)
// {
// // ignore the event
// return NO;
// }
// }
// }
if (self.threadId)
{
// if in a thread, ignore non-root event or events from other threads
if (![event.eventId isEqualToString:self.threadId] && ![event.threadId isEqualToString:self.threadId])
{
// Ignore the event
return NO;
}
// also ignore events related to un-threaded or events from other threads
if (!event.isInThread && event.relatesTo.eventId)
{
MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
inRoom:event.roomId];
if (![relatedEvent.threadId isEqualToString:self.threadId])
{
// ignore the event
return NO;
}
}
}
else if (RiotSettings.shared.enableThreads)
{
// if not in a thread, ignore all threaded events
if (event.isInThread)
{
// ignore the event
return NO;
}
// also ignore events related to threaded events
if (event.relatesTo.eventId)
{
MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
inRoom:event.roomId];
if (relatedEvent.isInThread)
{
// ignore the event
return NO;
}
}
}

return [super shouldQueueEventForProcessing:event roomState:roomState direction:direction];
}
Expand Down Expand Up @@ -478,26 +477,25 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
cellData:cellData contentViewPositionY:bottomPositionY upperDecorationView:urlPreviewView];
}

// Tchap: Disable Threads
// ThreadSummaryView *threadSummaryView;
//
// // display thread summary view if the component has a thread in the room timeline
// if (RiotSettings.shared.enableThreads && component.thread && !self.threadId)
// {
// threadSummaryView = [[ThreadSummaryView alloc] initWithThread:component.thread
// session:self.mxSession];
// threadSummaryView.delegate = self;
// threadSummaryView.tag = index;
//
// [temporaryViews addObject:threadSummaryView];
// UIView *upperDecorationView = reactionsView ?: urlPreviewView;
//
// [cellDecorator addThreadSummaryView:threadSummaryView
// toCell:bubbleCell
// cellData:cellData
// contentViewPositionY:bottomPositionY
// upperDecorationView:upperDecorationView];
// }
ThreadSummaryView *threadSummaryView;

// display thread summary view if the component has a thread in the room timeline
if (RiotSettings.shared.enableThreads && component.thread && !self.threadId)
{
threadSummaryView = [[ThreadSummaryView alloc] initWithThread:component.thread
session:self.mxSession];
threadSummaryView.delegate = self;
threadSummaryView.tag = index;

[temporaryViews addObject:threadSummaryView];
UIView *upperDecorationView = reactionsView ?: urlPreviewView;

[cellDecorator addThreadSummaryView:threadSummaryView
toCell:bubbleCell
cellData:cellData
contentViewPositionY:bottomPositionY
upperDecorationView:upperDecorationView];
}

MXKReceiptSendersContainer* avatarsContainer;

Expand Down Expand Up @@ -1213,12 +1211,11 @@ - (void)didCloseURLPreviewView:(URLPreviewView *)previewView for:(NSString *)eve

#pragma mark - ThreadSummaryViewDelegate

// Tchap: Disable Threads
//- (void)threadSummaryViewTapped:(ThreadSummaryView *)summaryView
//{
// [self.roomDataSourceDelegate roomDataSource:self
// didTapThread:summaryView.thread];
//}
- (void)threadSummaryViewTapped:(ThreadSummaryView *)summaryView
{
[self.roomDataSourceDelegate roomDataSource:self
didTapThread:summaryView.thread];
}

#pragma mark - Location sharing

Expand Down
11 changes: 5 additions & 6 deletions Riot/Modules/Room/RoomCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,12 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
self.selectedEventId = parameters.eventId
self.userIndicatorStore = UserIndicatorStore(presenter: parameters.userIndicatorPresenter)

// Tchap: Disable Threads
// if let threadId = parameters.threadId {
// self.roomViewController = ThreadViewController.instantiate(withThreadId: threadId,
// configuration: parameters.displayConfiguration)
// } else {
if let threadId = parameters.threadId {
self.roomViewController = ThreadViewController.instantiate(withThreadId: threadId,
configuration: parameters.displayConfiguration)
} else {
self.roomViewController = RoomViewController.instantiate(with: parameters.displayConfiguration)
// }
}
self.roomViewController.userIndicatorStore = userIndicatorStore
self.roomViewController.showSettingsInitially = parameters.showSettingsInitially

Expand Down
6 changes: 2 additions & 4 deletions Riot/Modules/Room/RoomViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@
@class UniversalLinkParameters;
@protocol RoomViewControllerDelegate;
@class RoomDisplayConfiguration;
// Tchap: Disable Threads
@class ThreadsCoordinatorBridgePresenter;
// Tchap: Disable Live location sharing
//@class ThreadsCoordinatorBridgePresenter;
//@class LiveLocationSharingBannerView;
@class VoiceBroadcastService;
@class ComposerLinkActionBridgePresenter;
Expand Down Expand Up @@ -355,8 +354,7 @@ didRequestEditForPollWithStartEvent:(MXEvent *)startEvent;
- (void)roomViewControllerDidTapLiveLocationSharingBanner:(RoomViewController *)roomViewController;

/// Request a threads coordinator for a given threadId, used to open a thread from within a room.
// Tchap: Disable Threads
//- (nullable ThreadsCoordinatorBridgePresenter *)threadsCoordinatorForRoomViewController:(RoomViewController *)roomViewController threadId:(nullable NSString *)threadId;
- (nullable ThreadsCoordinatorBridgePresenter *)threadsCoordinatorForRoomViewController:(RoomViewController *)roomViewController threadId:(nullable NSString *)threadId;

@end

Expand Down
Loading
Loading