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

Merge branch 'develop' into resilience-rc

Browse Source 
# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
This commit is contained in:
aringenbach
2022-11-07 15:05:25 +01:00
parent 1df5432fbf 775784150e
commit b7bf6353d0
138 changed files with 1484 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/MXKRoomViewController.m
+6 -1
View File
@@ -368,6 +368,8 @@
// Mark all messages as read when the room is displayed
[self.roomDataSource.room.summary markAllAsReadLocally];
[self updateCurrentEventIdAtTableBottom:YES];
}
- (void)viewWillDisappear:(BOOL)animated
@@ -2497,7 +2499,10 @@
updateReadMarker = (currentReadMarkerEvent && (currentReadMarkerEvent.originServerTs <= component.event.originServerTs));
}
[roomDataSource.room acknowledgeEvent:component.event andUpdateReadMarker:updateReadMarker];
if (self.navigationController.viewControllers.lastObject == self)
{
[roomDataSource.room acknowledgeEvent:component.event andUpdateReadMarker:updateReadMarker];
}
}
break;
}