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

MESSENGER-4682 imprint from wellknown (and fix lab feature list)

Browse Source
This commit is contained in:
Frank Rotermund
2023-06-22 09:48:24 +00:00
committed by JanNiklas Grabowski
parent c9296cc3a9
commit f70e354f75
8 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/SettingsViewController.m
+33 -12
View File
@@ -210,6 +210,7 @@ typedef NS_ENUM(NSUInteger, ABOUT)
ABOUT_TERM_CONDITIONS_INDEX,
ABOUT_ACCEPTABLE_USE_INDEX,
ABOUT_PRIVACY_INDEX,
ABOUT_IMPRINT_INDEX,
ABOUT_THIRD_PARTY_INDEX,
ABOUT_SUPPORT_INDEX,
ABOUT_SHOW_NSFW_ROOMS_INDEX,
@@ -219,7 +220,7 @@ typedef NS_ENUM(NSUInteger, ABOUT)
ABOUT_CLEAR_CACHE_INDEX,
ABOUT_REPORT_BUG_INDEX,
ABOUT_NETIQUETTE_INDEX,
ABOUT_ACCESSIBILITY_DECLARATION_INDEX
ABOUT_ACCESSIBILITY_DECLARATION_INDEX,
};
typedef NS_ENUM(NSUInteger, LABS_ENABLE)
@@ -733,6 +734,10 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
[sectionAbout addRowWithTag:ABOUT_ACCESSIBILITY_DECLARATION_INDEX];
}
[sectionAbout addRowWithTag:ABOUT_THIRD_PARTY_INDEX];
// bwi #4682 - Show Imprint
if ([self.mainSession.homeserverWellknown imprintURL]) {
[sectionAbout addRowWithTag:ABOUT_IMPRINT_INDEX];
}
sectionAbout.headerTitle = VectorL10n.settingsAbout;
[sectionAbout addRowWithTag:ABOUT_MARK_ALL_AS_READ_INDEX];
@@ -755,21 +760,23 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
if (BWIBuildSettings.shared.settingsScreenShowLabSettings)
{
Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
[sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_THREADS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS];
if (BWIBuildSettings.shared.locationSharingEnabled)
{
[sectionLabs addRowWithTag:LABS_ENABLE_LIVE_LOCATION_SHARING];
}
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_SESSION_MANAGER];
/* bwi: disabled for our apps
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_CLIENT_INFO_FEATURE];
[sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_THREADS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS];
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_CLIENT_INFO_FEATURE];
[sectionLabs addRowWithTag:LABS_ENABLE_LIVE_LOCATION_SHARING];
*/
if (@available(iOS 15.0, *))
{
[sectionLabs addRowWithTag:LABS_ENABLE_WYSIWYG_COMPOSER];
if (BWIBuildSettings.shared.enableLabFeatureWYSIWYG) {
if (@available(iOS 15.0, *))
{
[sectionLabs addRowWithTag:LABS_ENABLE_WYSIWYG_COMPOSER];
}
}
// bwi: disabled for our apps
if (BWIBuildSettings.shared.enableLabFeatureVoiceBroadcasts)
{
@@ -2697,6 +2704,16 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
cell = thirdPartyCell;
}
else if (row == ABOUT_IMPRINT_INDEX)
{
MXKTableViewCell *imprintCell = [self getDefaultTableViewCell:tableView];
imprintCell.textLabel.text = [BWIL10n settingsImprint];
[imprintCell vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
cell = imprintCell;
}
else if (row == ABOUT_SHOW_NSFW_ROOMS_INDEX)
{
MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
@@ -3343,6 +3360,10 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
[self pushViewController:webViewViewController];
}
else if (row == ABOUT_IMPRINT_INDEX)
{
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[self.mainSession.homeserverWellknown imprintURL]] options:@{} completionHandler:nil];
}
}
else if (section == SECTION_TAG_USER_SETTINGS)
{