Move MatrixKit defaults still in use to BuildSettings and replace register

This commit is contained in:
aringenbach
2022-07-04 15:51:33 +02:00
parent 437b2eafd6
commit b64bb2c70c
2 changed files with 31 additions and 10 deletions

View File

@@ -405,4 +405,17 @@ final class BuildSettings: NSObject {
static let tileServerMapStyleURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
static let locationSharingEnabled = true
// MARK: - MXKAppSettings
static let enableBotCreation: Bool = false
static let maxAllowedMediaCacheSize: Int = 1073741824
static let presenceColorForOfflineUser: Int = 15020851
static let presenceColorForOnlineUser: Int = 3401011
static let presenceColorForUnavailableUser: Int = 15066368
static let showAllEventsInRoomHistory: Bool = false
static let showLeftMembersInRoomMemberList: Bool = false
static let showRedactionsInRoomHistory: Bool = true
static let showUnsupportedEventsInRoomHistory: Bool = false
static let sortRoomMembersUsingLastSeenTime: Bool = true
static let syncLocalContacts: Bool = false
}

View File

@@ -4375,16 +4375,24 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
- (void)setupUserDefaults
{
// Register "Riot-Defaults.plist" default values
NSString* userDefaults = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UserDefaults"];
NSString *defaultsPathFromApp = [[NSBundle mainBundle] pathForResource:userDefaults ofType:@"plist"];
NSMutableDictionary *defaults = [[NSDictionary dictionaryWithContentsOfFile:defaultsPathFromApp] mutableCopy];
// add pusher ids, as they don't belong to plist anymore
defaults[@"pushKitAppIdProd"] = BuildSettings.pushKitAppIdProd;
defaults[@"pushKitAppIdDev"] = BuildSettings.pushKitAppIdDev;
defaults[@"pusherAppIdProd"] = BuildSettings.pusherAppIdProd;
defaults[@"pusherAppIdDev"] = BuildSettings.pusherAppIdDev;
// Register MatrixKit defaults.
NSDictionary *defaults = @{
@"enableBotCreation": @(BuildSettings.enableBotCreation),
@"maxAllowedMediaCacheSize": @(BuildSettings.maxAllowedMediaCacheSize),
@"presenceColorForOfflineUser": @(BuildSettings.presenceColorForOfflineUser),
@"presenceColorForOnlineUser": @(BuildSettings.presenceColorForOnlineUser),
@"presenceColorForUnavailableUser": @(BuildSettings.presenceColorForUnavailableUser),
@"showAllEventsInRoomHistory": @(BuildSettings.showAllEventsInRoomHistory),
@"showLeftMembersInRoomMemberList": @(BuildSettings.showLeftMembersInRoomMemberList),
@"showRedactionsInRoomHistory": @(BuildSettings.showRedactionsInRoomHistory),
@"showUnsupportedEventsInRoomHistory": @(BuildSettings.showUnsupportedEventsInRoomHistory),
@"sortRoomMembersUsingLastSeenTime": @(BuildSettings.syncLocalContacts),
@"syncLocalContacts": @(BuildSettings.syncLocalContacts),
@"pushKitAppIdProd": BuildSettings.pushKitAppIdProd,
@"pushKitAppIdDev": BuildSettings.pushKitAppIdDev,
@"pusherAppIdProd": BuildSettings.pusherAppIdProd,
@"pusherAppIdDev": BuildSettings.pusherAppIdDev
};
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];