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

Merge branch 'develop' into element_4218

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
This commit is contained in:
Gil Eluard
2021-04-20 15:27:27 +02:00
parent 0c265b3917 655584d9f5
commit bc282c7fdb
17 changed files with 986 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+5 -2
View File
@@ -1400,7 +1400,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
- (BOOL)supportCallOption
{
return BuildSettings.allowVoIPUsage && self.roomDataSource.mxSession.callManager && self.roomDataSource.room.summary.membersCount.joined >= 2;
BOOL callOptionAllowed = (self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForDirectRoom) || (!self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForNonDirectRoom);
return callOptionAllowed && BuildSettings.allowVoIPUsage && self.roomDataSource.mxSession.callManager && self.roomDataSource.room.summary.membersCount.joined >= 2;
}
- (BOOL)isCallActive
@@ -4134,7 +4135,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
if (needsUpdate)
{
BOOL needsReload = roomDataSource.currentTypingUsers == nil;
// BOOL needsReload = roomDataSource.currentTypingUsers == nil;
// Quick fix for https://github.com/vector-im/element-ios/issues/4230
BOOL needsReload = YES;
roomDataSource.currentTypingUsers = typingUsers;
if (needsReload)
{