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

Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'

Browse Source 
# Conflicts:
#   Config/BWIBuildSettings.swift
This commit is contained in:
JanNiklas Grabowski
2023-11-02 14:55:09 +00:00
parent a213954135 be45b997da
commit c6c874cf43
12 changed files with 102 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/BWIBuildSettings.swift
+6 -1
View File
@@ -522,7 +522,7 @@ class BWIBuildSettings: NSObject {
var forgotPasswordInformationAlert = true
// MARK: Promote new feature within a banner below the navigation view
var showTopBanner = true
var showTopBanner = false
var showCustomServerDisplayName = true
var customServerDisplayName = ""
@@ -690,6 +690,11 @@ class BWIBuildSettings: NSObject {
// MARK: Content Scanner Status Thumbnail
var showContentScannerStatusWithFilename = true
// MARK: Federation
@UserDefault(key: UserDefaultsKeys.isFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
var isFederationEnabled
// shows the grey/green/red shield for the room avatar / user avatar
var showEncryptionStatusBadgeOnAvatar = false
}