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

feat: remove changes after merge

Browse Source
This commit is contained in:
JanNiklas Grabowski
2024-08-19 16:20:23 +02:00
parent 6e5f30575b
commit eb005301ee
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Riot/Managers/Settings/RiotSettings.swift
View File

@@ -386,9 +386,6 @@ final class RiotSettings: NSObject {
@UserDefault(key: "settingsScreenShowNotificationDecodedContentOption", defaultValue: BWIBuildSettings.shared.settingsScreenShowNotificationDecodedContentOption, storage: defaults)
var settingsScreenShowNotificationDecodedContentOption
// BWI: #6076 removed from nv, need to be checked after merge
@UserDefault(key: "settingsScreenShowNsfwRoomsOption", defaultValue: BWIBuildSettings.shared.settingsScreenShowNsfwRoomsOption, storage: defaults)
var settingsScreenShowNsfwRoomsOption
@UserDefault(key: "settingsSecurityScreenShowSessions", defaultValue: BuildSettings.settingsSecurityScreenShowSessions, storage: defaults)

25
Riot/Modules/Settings/SettingsViewController.m
View File

@@ -724,11 +724,6 @@ SSOAuthenticationPresenterDelegate>
Section *sectionAdvanced = [Section sectionWithTag:SECTION_TAG_ADVANCED];
sectionAdvanced.headerTitle = [VectorL10n settingsAdvanced];
// BWI: #6076 check after merge
if (RiotSettings.shared.settingsScreenShowNsfwRoomsOption)
{
[sectionAdvanced addRowWithTag:ADVANCED_SHOW_NSFW_ROOMS_INDEX];
}
if (BWIBuildSettings.shared.settingsScreenAllowChangingCrashUsageDataSettings)
{
@@ -768,7 +763,7 @@ SSOAuthenticationPresenterDelegate>
[sectionAbout addRowWithTag:ABOUT_SUPPORT_INDEX];
}
if (RiotSettings.shared.settingsScreenShowNsfwRoomsOption)
if (BWIBuildSettings.shared.settingsScreenAllowBugReportingManually)
{
[sectionAbout addRowWithTag:ADVANCED_REPORT_BUG_INDEX];
}
@@ -2830,20 +2825,6 @@ SSOAuthenticationPresenterDelegate>
cell = imprintCell;
}
else if (row == ABOUT_SHOW_NSFW_ROOMS_INDEX)
{
MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
labelAndSwitchCell.mxkLabel.text = [VectorL10n settingsShowNSFWPublicRooms];
labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.showNSFWPublicRooms;
labelAndSwitchCell.mxkSwitch.thumbTintColor = ThemeService.shared.theme.backgroundColor;
labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
labelAndSwitchCell.mxkSwitch.enabled = YES;
[labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleNSFWPublicRoomsFiltering:) forControlEvents:UIControlEventTouchUpInside];
cell = labelAndSwitchCell;
}
else if (row == ADVANCED_CRASH_REPORT_INDEX)
{
MXKTableViewCellWithLabelAndSwitch* sendCrashReportCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
@@ -4753,10 +4734,6 @@ SSOAuthenticationPresenterDelegate>
}
}
- (void)toggleNSFWPublicRoomsFiltering:(UISwitch *)sender
{
RiotSettings.shared.showNSFWPublicRooms = sender.isOn;
}
- (void)showDeveloperSettings
{