Merged element 1.10.9 into bum

This commit is contained in:
Arnfried Griesert
2023-04-11 11:46:44 +02:00
73 changed files with 4351 additions and 979 deletions
@@ -206,6 +206,8 @@ typedef NS_ENUM(NSUInteger, ABOUT)
ABOUT_ELEMENT_VERSION_INDEX,
ABOUT_COPYRIGHT_INDEX,
ABOUT_TERM_CONDITIONS_INDEX,
ABOUT_COPYRIGHT_INDEX,
ABOUT_ACCEPTABLE_USE_INDEX,
ABOUT_PRIVACY_INDEX,
ABOUT_THIRD_PARTY_INDEX,
ABOUT_SUPPORT_INDEX,
@@ -719,7 +721,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
if (BWIBuildSettings.shared.applicationTermsConditionsUrlString.length)
{
[sectionAbout addRowWithTag:ABOUT_TERM_CONDITIONS_INDEX];
[sectionAbout addRowWithTag:ABOUT_ACCEPTABLE_USE_INDEX];
}
if (BWIBuildSettings.shared.applicationPrivacyPolicyUrlString.length)
{
@@ -3308,11 +3310,11 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
[self pushViewController:webViewViewController];
}
else if (row == ABOUT_TERM_CONDITIONS_INDEX)
else if (row == ABOUT_ACCEPTABLE_USE_INDEX)
{
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationTermsConditionsUrlString];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:BuildSettings.applicationAcceptableUsePolicyUrlString];
webViewViewController.title = [VectorL10n settingsTermConditions];
webViewViewController.title = [VectorL10n settingsAcceptableUse];
[webViewViewController vc_setLargeTitleDisplayMode:UINavigationItemLargeTitleDisplayModeNever];
[self pushViewController:webViewViewController];