Merge branch 'develop' into aleksandrs/6963_multi_session_logout

This commit is contained in:
paleksandrs
2022-11-02 14:02:52 +02:00
54 changed files with 451 additions and 160 deletions
@@ -1445,13 +1445,11 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
NSString *sdkVersionInfo = [NSString stringWithFormat:@"Matrix SDK %@", MatrixSDKVersion];
NSString *olmVersionInfo = [NSString stringWithFormat:@"OLM %@", [OLMKit versionString]];
[footerText appendFormat:@"%@\n", loggedUserInfo];
[footerText appendFormat:@"%@\n", homeserverInfo];
[footerText appendFormat:@"%@\n", appVersionInfo];
[footerText appendFormat:@"%@\n", sdkVersionInfo];
[footerText appendFormat:@"%@", olmVersionInfo];
[footerText appendFormat:@"%@", self.mainSession.crypto.version];
return [footerText copy];
}