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

Merge branch 'feature/4941_beta_features' into 'develop'

Browse Source 
MESSENGER 4941 add and remove beta features

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!201
This commit is contained in:
JanNiklas Grabowski
2023-09-07 12:35:41 +00:00
parent 99695336ff cd38534dc7
commit c16bc6da5f
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Config/AppConfiguration.swift
View File

@@ -55,6 +55,10 @@ class AppConfiguration: CommonConfiguration {
// bwi: explicitly set option for key sharing
MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = BWIBuildSettings.shared.allowKeySharingOnRoomInvite
// bwi: #4941 activate WYSIWYG and deactivate voice broadcast
RiotSettings.shared.enableWysiwygComposer = BWIBuildSettings.shared.enableFeatureWYSIWYGByDefault
RiotSettings.shared.enableVoiceBroadcast = BWIBuildSettings.shared.enableFeatureVoiceBroadcastsByDefault
}

4
Config/BWIBuildSettings.swift
View File

@@ -653,10 +653,10 @@ class BWIBuildSettings: NSObject {
var accessibilityDeclarationFileEn = ""
// MARK: Voice Broadcast
var enableLabFeatureVoiceBroadcasts = false
var enableFeatureVoiceBroadcastsByDefault = false
// MARK: WYSIWYG
var enableLabFeatureWYSIWYG = false
var enableFeatureWYSIWYGByDefault = true
// MARK: itunes
var itunesAppLink = ""

2
Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
View File

@@ -34,9 +34,7 @@ extension BWIBuildSettings {
bwiLoginFlowLayout = false
useRustEncryption = true
bwiNotificationTimes = true
enableLabFeatureVoiceBroadcasts = true
enableNewSessionManagerByDefault = true
enableLabFeatureWYSIWYG = true
showMaintenanceInfoMessageType = true
ignoreBlockingMaintenance = true

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

@@ -192,7 +192,7 @@ final class RiotSettings: NSObject {
var enableClientInformationFeature
/// Flag indicating if the wysiwyg composer feature is enabled
@UserDefault(key: "enableWysiwygComposer", defaultValue: false, storage: defaults)
@UserDefault(key: "enableWysiwygComposer", defaultValue: BWIBuildSettings.shared.enableFeatureWYSIWYGByDefault, storage: defaults)
var enableWysiwygComposer
@UserDefault(key: "enableWysiwygTextFormatting", defaultValue: true, storage: defaults)

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

@@ -801,18 +801,17 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
[sectionLabs addRowWithTag:LABS_ENABLE_LIVE_LOCATION_SHARING];
*/
if (BWIBuildSettings.shared.enableLabFeatureWYSIWYG) {
/* bwi: #4941 WYSIWYG is now live
if (@available(iOS 15.0, *))
{
[sectionLabs addRowWithTag:LABS_ENABLE_WYSIWYG_COMPOSER];
}
}
*/
// bwi: disabled for our apps
if (BWIBuildSettings.shared.enableLabFeatureVoiceBroadcasts)
/* bwi: #4941 disabled for our apps
{
[sectionLabs addRowWithTag:LABS_ENABLE_VOICE_BROADCAST];
}
*/
sectionLabs.headerTitle = [VectorL10n settingsLabs];
if (sectionLabs.hasAnyRows)
{