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

Merge branch 'master' into feature/5254_merge_element_into_bum

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
This commit is contained in:
Arnfried Griesert
2023-10-22 18:57:22 +02:00
parent 11f20de449 d3785e2343
commit 54aca03fc4
21 changed files with 195 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+10 -5
View File
@@ -1977,7 +1977,9 @@ static CGSize kThreadListBarButtonItemImageSize;
if (self.supportCallOption)
{
if (self.roomDataSource.room.summary.membersCount.joined == 2 && self.roomDataSource.room.isDirect)
if (self.roomDataSource.room.summary.membersCount.joined == 2
&& self.roomDataSource.room.isDirect
&& !self.mainSession.vc_homeserverConfiguration.jitsi.useFor1To1Calls)
{
// voice call button for Matrix call
UIBarButtonItem *itemVoice = [[UIBarButtonItem alloc] initWithImage:AssetImages.voiceCallHangonIcon.image
@@ -3163,15 +3165,16 @@ static CGSize kThreadListBarButtonItemImageSize;
- (void)displayNewDirectChatWithTargetUser:(nonnull MXUser*)directChatTargetUser session:(nonnull MXSession*)session
{
// `[displayRoom:]` may require the session, setting it here before calling it
[self addMatrixSession:session];
// Release existing room data source or preview
[self displayRoom:nil];
self.directChatTargetUser = directChatTargetUser;
self.eventsAcknowledgementEnabled = NO;
[self addMatrixSession:session];
[self refreshRoomTitle];
[self refreshRoomInputToolbar];
}
@@ -5097,7 +5100,9 @@ static CGSize kThreadListBarButtonItemImageSize;
}
else
{
if (self.roomDataSource.room.summary.membersCount.joined == 2 && self.roomDataSource.room.isDirect)
if (self.roomDataSource.room.summary.membersCount.joined == 2
&& self.roomDataSource.room.isDirect
&& !self.mainSession.vc_homeserverConfiguration.jitsi.useFor1To1Calls)
{
// Matrix call
[self.roomDataSource.room placeCallWithVideo:video success:nil failure:nil];