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

Merge branch 'develop' into ismail/4384_room_summary_store

Browse Source
This commit is contained in:
ismailgulek
2021-09-28 17:30:39 +03:00
parent e3e713ab1c 12cb5fa2d9
commit f76f778e0b
319 changed files with 12712 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
+1 -1
View File
@@ -163,7 +163,7 @@
[session setStore:[ShareExtensionManager sharedManager].fileStore success:^{
MXStrongifyAndReturnIfNil(session);
MXRoom *selectedRoom = [MXRoom loadRoomFromStore:[ShareExtensionManager sharedManager].fileStore withRoomId:recentCellData.roomSummary.roomId matrixSession:session];
MXRoom *selectedRoom = [MXRoom loadRoomFromStore:[ShareExtensionManager sharedManager].fileStore withRoomId:recentCellData.roomIdentifier matrixSession:session];
// Do not warn for unknown devices. We have cross-signing now
session.crypto.warnOnUnknowDevices = NO;
RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+4 -3
View File
@@ -70,10 +70,11 @@
roomCellData = (id<MXKRecentCellDataStoring>)cellData;
if (roomCellData)
{
MXRoomSummary *roomSummary = [roomCellData.mxSession roomSummaryWithRoomId:roomCellData.roomSummary.roomId];
[roomSummary setRoomAvatarImageIn:self.avatarImageView];
[self.avatarImageView vc_setRoomAvatarImageWith:roomCellData.avatarUrl
displayName:roomCellData.roomDisplayname
mediaManager:roomCellData.mxSession.mediaManager];
self.roomTitleLabel.text = roomCellData.roomSummary.displayname;
self.roomTitleLabel.text = roomCellData.roomDisplayname;
if (!self.roomTitleLabel.text.length)
{
self.roomTitleLabel.text = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];