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

Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2023-07-04 08:24:05 +02:00
parent d49c0d59ad fda01a1869
commit 242e35fdc7
60 changed files with 1658 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+2 -2
View File
@@ -2099,7 +2099,7 @@ static CGSize kThreadListBarButtonItemImageSize;
{
[userPictureView vc_setRoomAvatarImageWith:self.directChatTargetUser.avatarUrl
roomId:self.directChatTargetUser.userId
displayName:self.directChatTargetUser.displayname
displayName:self.directChatTargetUser.displayname ?: self.directChatTargetUser.userId
mediaManager:self.mainSession.mediaManager];
}
}
@@ -5229,7 +5229,7 @@ static CGSize kThreadListBarButtonItemImageSize;
- (MXMediaManager *)mediaManager
{
return self.roomDataSource.mxSession.mediaManager;
return self.mainSession.mediaManager;
}
- (void)roomInputToolbarViewDidOpenActionMenu:(RoomInputToolbarView*)toolbarView