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

Merge commit 'a8c505c2f9175ae0bece1f62708e6fc31e587897' into feature/3746_merge_element_1.9.10

Browse Source 
# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml
This commit is contained in:
Frank Rotermund
2022-11-02 14:05:36 +01:00
parent 9e41e2825e 633939425b
commit 6c9d681149
467 changed files with 18708 additions and 2131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/Security/SecurityViewController.m
+6 -6
View File
@@ -162,6 +162,7 @@ TableViewSectionsDelegate>
// Do any additional setup after loading the view, typically from a nib.
self.navigationItem.title = [VectorL10n securitySettingsTitle];
[self vc_setLargeTitleDisplayMode:UINavigationItemLargeTitleDisplayModeNever];
[self vc_removeBackTitle];
[self.tableView registerClass:MXKTableViewCellWithLabelAndSwitch.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndSwitch defaultReuseIdentifier]];
@@ -335,8 +336,7 @@ TableViewSectionsDelegate>
}
// Crypto sessions section
if (RiotSettings.shared.settingsSecurityScreenShowSessions)
if (RiotSettings.shared.settingsSecurityScreenShowSessions && !RiotSettings.shared.enableNewSessionManager)
{
Section *sessionsSection = [Section sectionWithTag:SECTION_CRYPTO_SESSIONS];
@@ -643,7 +643,7 @@ TableViewSectionsDelegate>
- (void)loadCrossSigning
{
MXCrossSigning *crossSigning = self.mainSession.crypto.crossSigning;
id<MXCrossSigning> crossSigning = self.mainSession.crypto.crossSigning;
[crossSigning refreshStateWithSuccess:^(BOOL stateUpdated) {
if (stateUpdated)
@@ -659,7 +659,7 @@ TableViewSectionsDelegate>
{
NSInteger numberOfRowsInCrossSigningSection;
MXCrossSigning *crossSigning = self.mainSession.crypto.crossSigning;
id<MXCrossSigning> crossSigning = self.mainSession.crypto.crossSigning;
switch (crossSigning.state)
{
case MXCrossSigningStateNotBootstrapped: // Action: Bootstrap
@@ -677,7 +677,7 @@ TableViewSectionsDelegate>
- (NSAttributedString*)crossSigningInformation
{
MXCrossSigning *crossSigning = self.mainSession.crypto.crossSigning;
id<MXCrossSigning> crossSigning = self.mainSession.crypto.crossSigning;
NSString *crossSigningInformation;
switch (crossSigning.state)
@@ -724,7 +724,7 @@ TableViewSectionsDelegate>
buttonCell.mxkButton.accessibilityIdentifier = nil;
// And customise it
MXCrossSigning *crossSigning = self.mainSession.crypto.crossSigning;
id<MXCrossSigning> crossSigning = self.mainSession.crypto.crossSigning;
switch (crossSigning.state)
{
case MXCrossSigningStateNotBootstrapped: // Action: Bootstrap