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

Fix conflicts.

Browse Source
This commit is contained in:
SBiOSoftWhare
2022-02-16 17:31:55 +01:00
parent 416d3dd002 80375f0893
commit cacce3e84b
143 changed files with 1894 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
+7 -2
View File
@@ -89,6 +89,10 @@
{
continueBlock();
}
else if (result.result.unsignedData.relations.thread)
{
continueBlock();
}
else if (room)
{
[room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
@@ -164,8 +168,9 @@
{
if (cellData.hasThreadRoot)
{
MXThread *thread = cellData.bubbleComponents.firstObject.thread;
ThreadSummaryView *threadSummaryView = [[ThreadSummaryView alloc] initWithThread:thread];
id<MXThreadProtocol> thread = cellData.bubbleComponents.firstObject.thread;
ThreadSummaryView *threadSummaryView = [[ThreadSummaryView alloc] initWithThread:thread
session:self.mxSession];
[bubbleCell.tmpSubviews addObject:threadSummaryView];
threadSummaryView.translatesAutoresizingMaskIntoConstraints = NO;