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

Merge branch 'develop' into xcode11

Browse Source 
# Conflicts:
#	CHANGES.rst
This commit is contained in:
ismailgulek
2020-06-05 16:00:24 +03:00
parent 578c763b8b 609291ba76
commit 8537141ffb
5 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Riot/Modules/Settings/Security/SecurityViewController.m
View File

@@ -425,7 +425,6 @@ UIDocumentInteractionControllerDelegate>
{
case MXCrossSigningStateNotBootstrapped: // Action: Bootstrap
case MXCrossSigningStateCanCrossSign: // Action: Reset
case MXCrossSigningStateCanCrossSignAsynchronously: // Action: Reset
numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1;
break;
case MXCrossSigningStateCrossSigningExists: // Actions: Verify this session, Reset
@@ -454,7 +453,6 @@ UIDocumentInteractionControllerDelegate>
crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_trusted"];
break;
case MXCrossSigningStateCanCrossSign:
case MXCrossSigningStateCanCrossSignAsynchronously:
crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_ok"];
break;
}
@@ -489,7 +487,6 @@ UIDocumentInteractionControllerDelegate>
[self setUpcrossSigningButtonCellForBootstrap:buttonCell];
break;
case MXCrossSigningStateCanCrossSign: // Action: Reset
case MXCrossSigningStateCanCrossSignAsynchronously: // Action: Reset
[self setUpcrossSigningButtonCellForReset:buttonCell];
break;
case MXCrossSigningStateCrossSigningExists: // Actions: Verify this session, Reset