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 'develop' into steve/5903_lls_start

Browse Source 
# Conflicts:
#	Riot/Modules/Room/RoomViewController.h
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
This commit is contained in:
SBiOSoftWhare
2022-04-08 11:09:06 +02:00
parent ad0bf639a8 1f6fb2b2bf
commit 92a721c8b9
221 changed files with 8846 additions and 1792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/DataSources/RoomDataSource.m
+8 -1
View File
@@ -982,6 +982,13 @@ const CGFloat kTypingCellHeight = 24;
// no need to reload when paginating back
return;
}
BOOL notify = YES;
if (self.threadId)
{
// no need to notify the thread screen, it'll cause a flickering
notify = NO;
}
NSUInteger count = 0;
@synchronized (bubbles)
{
@@ -989,7 +996,7 @@ const CGFloat kTypingCellHeight = 24;
}
if (count > 0)
{
[self reload];
[self reloadNotifying:notify];
}
}